# HG changeset patch
# User Vladimir Marek <Vladimir.Marek@oracle.com>
# Date 1385397738 -3600
# Node ID 308d0c1926645a2ded1ea6d98bf31211e417f985
# Parent  5260a9f352d7c1135d64654c4914c60ec4b9f5a3
17714341 /usr/bin/cd core dumps during string substitution

diff -r 5260a9f352d7 -r 308d0c192664 components/ksh93/Makefile
--- a/components/ksh93/Makefile	Thu Oct 24 11:32:37 2013 +0200
+++ b/components/ksh93/Makefile	Mon Nov 25 17:42:18 2013 +0100
@@ -74,7 +74,7 @@
 					 CR7168611.patch CR7178717.patch \
 					 CR7175995.patch CR7128313.patch \
 					 Bug15794787,15819673.patch \
-					 Bug15808407.patch
+					 Bug15808407.patch Bug17714341.patch
 # Fixup HOSTTYPE to match uname output and bits
 HOSTTYPE32=sol11.$(shell uname -p)
 HOSTTYPE64=sol11.$(shell uname -p)-64
diff -r 5260a9f352d7 -r 308d0c192664 components/ksh93/patches/Bug17714341.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ksh93/patches/Bug17714341.patch	Mon Nov 25 17:42:18 2013 +0100
@@ -0,0 +1,11 @@
+--- a/src/cmd/ksh93/bltins/cd_pwd.c	2013-10-31 16:18:43.904039613 +0100
++++ b/src/cmd/ksh93/bltins/cd_pwd.c	2013-10-31 16:18:14.980499662 +0100
+@@ -81,7 +81,7 @@
+ 	dir =  argv[0];
+ 	if(error_info.errors>0 || argc >2)
+ 		errormsg(SH_DICT,ERROR_usage(2),"%s",optusage((char*)0));
+-	oldpwd = (char*)shp->pwd;
++	oldpwd = path_pwd(shp,0);
+ 	opwdnod = (shp->subshell?sh_assignok(OLDPWDNOD,1):OLDPWDNOD); 
+ 	pwdnod = (shp->subshell?sh_assignok(PWDNOD,1):PWDNOD); 
+ 	if(argc==2)