author | Norm Jacobs <Norm.Jacobs@Oracle.COM> |
Mon, 27 Apr 2015 10:19:50 -0500 | |
changeset 4196 | d697072a92f5 |
parent 808 | components/ksh93/patches/CR7167466.patch@ecce981c9c5a |
permissions | -rw-r--r-- |
808
ecce981c9c5a
7167466 ksh93 dumps core when processing comments (lines beginning with '#') in s11u1_15
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
1 |
diff -rupN INIT.2011-02-08.clean/src/cmd/ksh93/edit/edit.c INIT.2011-02-08/src/cmd/ksh93/edit/edit.c |
ecce981c9c5a
7167466 ksh93 dumps core when processing comments (lines beginning with '#') in s11u1_15
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
2 |
--- INIT.2011-02-08.clean/src/cmd/ksh93/edit/edit.c 2012-05-10 12:44:32.651317787 +0100 |
ecce981c9c5a
7167466 ksh93 dumps core when processing comments (lines beginning with '#') in s11u1_15
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
3 |
+++ INIT.2011-02-08/src/cmd/ksh93/edit/edit.c 2012-05-10 12:49:00.804744460 +0100 |
ecce981c9c5a
7167466 ksh93 dumps core when processing comments (lines beginning with '#') in s11u1_15
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
4 |
@@ -1652,7 +1652,7 @@ int ed_histgen(Edit_t *ep,const char *pa |
ecce981c9c5a
7167466 ksh93 dumps core when processing comments (lines beginning with '#') in s11u1_15
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
5 |
History_t *hp; |
ecce981c9c5a
7167466 ksh93 dumps core when processing comments (lines beginning with '#') in s11u1_15
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
6 |
off_t offset; |
ecce981c9c5a
7167466 ksh93 dumps core when processing comments (lines beginning with '#') in s11u1_15
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
7 |
int ac=0,l,m,n,index1,index2; |
ecce981c9c5a
7167466 ksh93 dumps core when processing comments (lines beginning with '#') in s11u1_15
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
8 |
- char *cp, **argv, **av, **ar; |
ecce981c9c5a
7167466 ksh93 dumps core when processing comments (lines beginning with '#') in s11u1_15
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
9 |
+ char *cp, **argv=NULL, **av, **ar; |
ecce981c9c5a
7167466 ksh93 dumps core when processing comments (lines beginning with '#') in s11u1_15
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
10 |
if(!(hp=ep->sh->gd->hist_ptr)) |
ecce981c9c5a
7167466 ksh93 dumps core when processing comments (lines beginning with '#') in s11u1_15
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
11 |
return(0); |
ecce981c9c5a
7167466 ksh93 dumps core when processing comments (lines beginning with '#') in s11u1_15
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
12 |
if(*pattern=='#') |
ecce981c9c5a
7167466 ksh93 dumps core when processing comments (lines beginning with '#') in s11u1_15
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
13 |
@@ -1731,7 +1731,7 @@ int ed_histgen(Edit_t *ep,const char *pa |
ecce981c9c5a
7167466 ksh93 dumps core when processing comments (lines beginning with '#') in s11u1_15
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
14 |
mplast->next = 0; |
ecce981c9c5a
7167466 ksh93 dumps core when processing comments (lines beginning with '#') in s11u1_15
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
15 |
} |
ecce981c9c5a
7167466 ksh93 dumps core when processing comments (lines beginning with '#') in s11u1_15
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
16 |
ep->hlist = (Histmatch_t**)argv; |
ecce981c9c5a
7167466 ksh93 dumps core when processing comments (lines beginning with '#') in s11u1_15
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
17 |
- ep->hfirst = ep->hlist[0]; |
ecce981c9c5a
7167466 ksh93 dumps core when processing comments (lines beginning with '#') in s11u1_15
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
18 |
+ ep->hfirst = ep->hlist ? ep->hlist[0] : NULL; |
ecce981c9c5a
7167466 ksh93 dumps core when processing comments (lines beginning with '#') in s11u1_15
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
19 |
return(ep->hmax=ac); |
ecce981c9c5a
7167466 ksh93 dumps core when processing comments (lines beginning with '#') in s11u1_15
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
20 |
} |
ecce981c9c5a
7167466 ksh93 dumps core when processing comments (lines beginning with '#') in s11u1_15
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
21 |