Dr. Werner Fink 2013-11-20 11:49:06 +00:00 committed by Git OBS Bridge
parent cb68c806ac
commit ec4f200579
2 changed files with 14 additions and 0 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Nov 20 11:42:55 UTC 2013 - werner@suse.de
- Make typeset builtin not crash but show an error (bnc#851300)
-------------------------------------------------------------------
Mon Nov 18 16:04:27 UTC 2013 - werner@suse.de

View File

@ -18,6 +18,15 @@
if(aflag=='+')
return;
if(nv_isarray(np) && nv_arrayptr(np))
@@ -538,7 +541,7 @@ static int setall(char **argv,regist
}
else if(*shp->prefix==0)
shp->prefix = 0;
- if(*argv[0]=='+')
+ if(*argv && *argv[0]=='+')
nvflags |= NV_NOADD;
flag &= ~(NV_NOARRAY|NV_NOSCOPE|NV_VARNAME|NV_IDENT|NV_STATIC|NV_COMVAR|NV_IARRAY);
if(argv[1])
@@ -675,6 +678,7 @@ static int setall(char **argv,regist
{
if(comvar || (shp->last_root==shp->var_tree && (tp->tp || (!shp->st.real_fun && (nvflags&NV_STATIC)) || (!(flag&(NV_EXPORT|NV_RDONLY)) && nv_isattr(np,(NV_EXPORT|NV_IMPORT))==(NV_EXPORT|NV_IMPORT)))))