|
 |
ff22b9 |
diff -up ksh-20120801/src/cmd/ksh93/sh/init.c.covsfix ksh-20120801/src/cmd/ksh93/sh/init.c
|
|
|
ff22b9 |
--- ksh-20120801/src/cmd/ksh93/sh/init.c.covsfix 2013-07-22 17:41:34.674054068 +0200
|
|
|
ff22b9 |
+++ ksh-20120801/src/cmd/ksh93/sh/init.c 2013-07-22 17:42:50.761361921 +0200
|
|
|
ff22b9 |
@@ -1237,9 +1237,11 @@ static void put_mode(Namval_t* np, const
|
|
|
ff22b9 |
mode = *(double*)val;
|
|
|
ff22b9 |
}
|
|
|
ff22b9 |
else
|
|
|
ff22b9 |
+ {
|
|
|
ff22b9 |
mode = strperm(val, &last,0);
|
|
|
ff22b9 |
- if(*last)
|
|
|
ff22b9 |
- errormsg(SH_DICT,ERROR_exit(1),"%s: invalid mode string",val);
|
|
|
ff22b9 |
+ if(*last)
|
|
|
ff22b9 |
+ errormsg(SH_DICT,ERROR_exit(1),"%s: invalid mode string",val);
|
|
|
ff22b9 |
+ }
|
|
|
ff22b9 |
nv_putv(np,(char*)&mode,NV_INTEGER,nfp);
|
|
|
ff22b9 |
}
|
|
|
ff22b9 |
else
|
|
|
ff22b9 |
diff -up ksh-20120801/src/cmd/ksh93/sh/io.c.covsfix ksh-20120801/src/cmd/ksh93/sh/io.c
|
|
|
ff22b9 |
--- ksh-20120801/src/cmd/ksh93/sh/io.c.covsfix 2013-07-22 17:06:30.282927080 +0200
|
|
|
ff22b9 |
+++ ksh-20120801/src/cmd/ksh93/sh/io.c 2013-07-22 17:08:49.645721280 +0200
|
|
|
ff22b9 |
@@ -954,6 +954,7 @@ int sh_pipe(register int pv[])
|
|
|
ff22b9 |
socklen_t slen;
|
|
|
ff22b9 |
if ((pv[out] = socket (AF_INET, SOCK_STREAM, 0)) < 0)
|
|
|
ff22b9 |
errormsg(SH_DICT,ERROR_system(1),e_pipe);
|
|
|
ff22b9 |
+ memset(&sin.sin_zero, 0, sizeof(sin.sin_zero));
|
|
|
ff22b9 |
do
|
|
|
ff22b9 |
{
|
|
|
ff22b9 |
sin.sin_family = AF_INET;
|
|
|
ff22b9 |
diff -up ksh-20120801/src/cmd/ksh93/sh/name.c.covsfix ksh-20120801/src/cmd/ksh93/sh/name.c
|
|
|
ff22b9 |
--- ksh-20120801/src/cmd/ksh93/sh/name.c.covsfix 2013-07-22 17:40:31.644635604 +0200
|
|
|
ff22b9 |
+++ ksh-20120801/src/cmd/ksh93/sh/name.c 2013-07-22 17:41:15.828227073 +0200
|
|
|
ff22b9 |
@@ -3094,6 +3094,7 @@ void nv_newattr (register Namval_t *np,
|
|
|
ff22b9 |
if(!mp)
|
|
|
ff22b9 |
nv_putval (np, cp, NV_RDONLY);
|
|
|
ff22b9 |
free(cp);
|
|
|
ff22b9 |
+ cp = NULL;
|
|
|
ff22b9 |
}
|
|
|
ff22b9 |
}
|
|
|
ff22b9 |
while(ap && nv_nextsub(np));
|
|
|
ff22b9 |
diff -up ksh-20120801/src/cmd/ksh93/sh/subshell.c.covsfix ksh-20120801/src/cmd/ksh93/sh/subshell.c
|
|
|
ff22b9 |
--- ksh-20120801/src/cmd/ksh93/sh/subshell.c.covsfix 2013-07-22 17:46:15.607533423 +0200
|
|
|
ff22b9 |
+++ ksh-20120801/src/cmd/ksh93/sh/subshell.c 2013-07-22 17:48:36.739290968 +0200
|
|
|
ff22b9 |
@@ -205,7 +205,14 @@ void sh_subfork(void)
|
|
|
ff22b9 |
shp->comsub = 0;
|
|
|
ff22b9 |
SH_SUBSHELLNOD->nvalue.s = 0;
|
|
|
ff22b9 |
sp->subpid=0;
|
|
|
ff22b9 |
- shp->st.trapcom[0] = (comsub==2?NULL:trap);
|
|
|
ff22b9 |
+ if (comsub==2)
|
|
|
ff22b9 |
+ {
|
|
|
ff22b9 |
+ shp->st.trapcom[0] = NULL;
|
|
|
ff22b9 |
+ if(trap)
|
|
|
ff22b9 |
+ free((void*)trap);
|
|
|
ff22b9 |
+ }
|
|
|
ff22b9 |
+ else
|
|
|
ff22b9 |
+ shp->st.trapcom[0] = (comsub==2?NULL:trap);
|
|
|
ff22b9 |
shp->savesig = 0;
|
|
|
ff22b9 |
}
|
|
|
ff22b9 |
}
|