Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/ksh93/patches/Bug15808407.patch
author Danek Duvall <danek.duvall@oracle.com>
Fri, 15 May 2015 11:21:43 -0700
branchs11-update
changeset 4318 7f2f7aebce6e
parent 2531 86ae973f1705
permissions -rw-r--r--
21063316 pkg update fails from s11.2.10.0.5 to s11.3_21
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2531
86ae973f1705 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
86ae973f1705 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
86ae973f1705 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 @@
86ae973f1705 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)
86ae973f1705 15808407 SUNBT7189531 ksh93 crash+core dump with minimalist script
Rohith Ramesh Bangalore India <rohith.ramesh@oracle.com>
parents:
diff changeset 
     5
 
 {
86ae973f1705 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);
86ae973f1705 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;
86ae973f1705 15808407 SUNBT7189531 ksh93 crash+core dump with minimalist script
Rohith Ramesh Bangalore India <rohith.ramesh@oracle.com>
parents:
diff changeset 
     8
 
+	void 	*histopen = NULL;
86ae973f1705 15808407 SUNBT7189531 ksh93 crash+core dump with minimalist script
Rohith Ramesh Bangalore India <rohith.ramesh@oracle.com>
parents:
diff changeset 
     9
 
 	char	*cp;
86ae973f1705 15808407 SUNBT7189531 ksh93 crash+core dump with minimalist script
Rohith Ramesh Bangalore India <rohith.ramesh@oracle.com>
parents:
diff changeset 
    10
 
+	if( shp ) {
86ae973f1705 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;
86ae973f1705 15808407 SUNBT7189531 ksh93 crash+core dump with minimalist script
Rohith Ramesh Bangalore India <rohith.ramesh@oracle.com>
parents:
diff changeset 
    12
 
+	}
86ae973f1705 15808407 SUNBT7189531 ksh93 crash+core dump with minimalist script
Rohith Ramesh Bangalore India <rohith.ramesh@oracle.com>
parents:
diff changeset 
    13
 
 	if(val && histopen)
86ae973f1705 15808407 SUNBT7189531 ksh93 crash+core dump with minimalist script
Rohith Ramesh Bangalore India <rohith.ramesh@oracle.com>
parents:
diff changeset 
    14
 
 	{
86ae973f1705 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)
upstream/oracle/userland-gate