# HG changeset patch
# User Edwin Beasant <Edwin.Beasant@oracle.com>
# Date 1336655401 -3600
# Node ID ecce981c9c5a7a9a466283c0145012d356217b7a
# Parent  09fc563892524e6db92f549ad0fd03dc5f6d8a5d
7167466 ksh93 dumps core when processing comments (lines beginning with '#') in s11u1_15

diff -r 09fc56389252 -r ecce981c9c5a components/ksh93/Makefile
--- a/components/ksh93/Makefile	Wed May 09 10:18:54 2012 -0700
+++ b/components/ksh93/Makefile	Thu May 10 14:10:01 2012 +0100
@@ -69,7 +69,7 @@
 					 CR7061011.patch CR6934836.patch \
 					 CR7089799.patch CR6917338.patch \
 					 CR7019368.patch CR6729252.patch \
-					 MAP_TYPE_64_Bits.patch
+					 MAP_TYPE_64_Bits.patch CR7167466.patch
 
 					 
 					 
diff -r 09fc56389252 -r ecce981c9c5a components/ksh93/patches/CR7167466.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ksh93/patches/CR7167466.patch	Thu May 10 14:10:01 2012 +0100
@@ -0,0 +1,21 @@
+diff -rupN INIT.2011-02-08.clean/src/cmd/ksh93/edit/edit.c INIT.2011-02-08/src/cmd/ksh93/edit/edit.c
+--- INIT.2011-02-08.clean/src/cmd/ksh93/edit/edit.c	2012-05-10 12:44:32.651317787 +0100
++++ INIT.2011-02-08/src/cmd/ksh93/edit/edit.c	2012-05-10 12:49:00.804744460 +0100
+@@ -1652,7 +1652,7 @@ int ed_histgen(Edit_t *ep,const char *pa
+ 	History_t	*hp;
+ 	off_t		offset;
+ 	int 		ac=0,l,m,n,index1,index2;
+-	char		*cp, **argv, **av, **ar;
++	char		*cp, **argv=NULL, **av, **ar;
+ 	if(!(hp=ep->sh->gd->hist_ptr))
+ 		return(0);
+ 	if(*pattern=='#')
+@@ -1731,7 +1731,7 @@ int ed_histgen(Edit_t *ep,const char *pa
+ 		mplast->next = 0;
+ 	}
+ 	ep->hlist = (Histmatch_t**)argv;
+-	ep->hfirst = ep->hlist[0];
++	ep->hfirst = ep->hlist ? ep->hlist[0] : NULL;
+ 	return(ep->hmax=ac);
+ }
+