components/ksh93/patches/180-Bug15808407.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Mon, 18 May 2015 14:11:16 -0700
changeset 4305 90493abe0c5c
parent 4196 d697072a92f5
permissions -rw-r--r--
backout 17533968/17817727/17699248/17777549/18119738/18229654/16169978/18302723/16507675/18920300/18355790/19907453/18426052/20808157/20948390/20948350 - causes 21091065
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1167
d9893d2bc7c8 15808407 SUNBT7189531 ksh93 crash+core dump with minimalist script
Rohith Ramesh Bangalore India <rohith.ramesh@oracle.com>
parents:
diff changeset
     1
--- a/src/cmd/ksh93/sh/init.c	2013-01-28 01:37:27.339300867 -0800
d9893d2bc7c8 15808407 SUNBT7189531 ksh93 crash+core dump with minimalist script
Rohith Ramesh Bangalore India <rohith.ramesh@oracle.com>
parents:
diff changeset
     2
+++ b/src/cmd/ksh93/sh/init.c	2013-01-28 01:39:31.614342117 -0800
d9893d2bc7c8 15808407 SUNBT7189531 ksh93 crash+core dump with minimalist script
Rohith Ramesh Bangalore India <rohith.ramesh@oracle.com>
parents:
diff changeset
     3
@@ -278,8 +278,11 @@
d9893d2bc7c8 15808407 SUNBT7189531 ksh93 crash+core dump with minimalist script
Rohith Ramesh Bangalore India <rohith.ramesh@oracle.com>
parents:
diff changeset
     4
 static void put_history(register Namval_t* np,const char *val,int flags,Namfun_t *fp)
d9893d2bc7c8 15808407 SUNBT7189531 ksh93 crash+core dump with minimalist script
Rohith Ramesh Bangalore India <rohith.ramesh@oracle.com>
parents:
diff changeset
     5
 {
d9893d2bc7c8 15808407 SUNBT7189531 ksh93 crash+core dump with minimalist script
Rohith Ramesh Bangalore India <rohith.ramesh@oracle.com>
parents:
diff changeset
     6
 	Shell_t *shp = nv_shell(np);
d9893d2bc7c8 15808407 SUNBT7189531 ksh93 crash+core dump with minimalist script
Rohith Ramesh Bangalore India <rohith.ramesh@oracle.com>
parents:
diff changeset
     7
-	void 	*histopen = shp->gd->hist_ptr;
d9893d2bc7c8 15808407 SUNBT7189531 ksh93 crash+core dump with minimalist script
Rohith Ramesh Bangalore India <rohith.ramesh@oracle.com>
parents:
diff changeset
     8
+	void 	*histopen = NULL;
d9893d2bc7c8 15808407 SUNBT7189531 ksh93 crash+core dump with minimalist script
Rohith Ramesh Bangalore India <rohith.ramesh@oracle.com>
parents:
diff changeset
     9
 	char	*cp;
d9893d2bc7c8 15808407 SUNBT7189531 ksh93 crash+core dump with minimalist script
Rohith Ramesh Bangalore India <rohith.ramesh@oracle.com>
parents:
diff changeset
    10
+	if( shp ) { 
d9893d2bc7c8 15808407 SUNBT7189531 ksh93 crash+core dump with minimalist script
Rohith Ramesh Bangalore India <rohith.ramesh@oracle.com>
parents:
diff changeset
    11
+	    histopen = shp->gd->hist_ptr; 
d9893d2bc7c8 15808407 SUNBT7189531 ksh93 crash+core dump with minimalist script
Rohith Ramesh Bangalore India <rohith.ramesh@oracle.com>
parents:
diff changeset
    12
+	}
d9893d2bc7c8 15808407 SUNBT7189531 ksh93 crash+core dump with minimalist script
Rohith Ramesh Bangalore India <rohith.ramesh@oracle.com>
parents:
diff changeset
    13
 	if(val && histopen)
d9893d2bc7c8 15808407 SUNBT7189531 ksh93 crash+core dump with minimalist script
Rohith Ramesh Bangalore India <rohith.ramesh@oracle.com>
parents:
diff changeset
    14
 	{
d9893d2bc7c8 15808407 SUNBT7189531 ksh93 crash+core dump with minimalist script
Rohith Ramesh Bangalore India <rohith.ramesh@oracle.com>
parents:
diff changeset
    15
 		if(np==HISTFILE && (cp=nv_getval(np)) && strcmp(val,cp)==0)