rpms/ksh/F-8 ksh-20071105-optind.patch,NONE,1.1 ksh.spec,1.35,1.36

Tomas Smetana (tsmetana) fedora-extras-commits at redhat.com
Wed Jan 30 07:45:06 UTC 2008


Author: tsmetana

Update of /cvs/pkgs/rpms/ksh/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18979

Modified Files:
	ksh.spec 
Added Files:
	ksh-20071105-optind.patch 
Log Message:
* Wed Jan 30 2008 Tomas Smetana <tsmetana at redhat.com> 20071105-3
- fix #430602 - ksh segfaults after unsetting OPTIND


ksh-20071105-optind.patch:

--- NEW FILE ksh-20071105-optind.patch ---
diff -up ksh-20071105/src/cmd/ksh93/sh/init.c.optind ksh-20071105/src/cmd/ksh93/sh/init.c
--- ksh-20071105/src/cmd/ksh93/sh/init.c.optind	2008-01-30 07:56:28.000000000 +0100
+++ ksh-20071105/src/cmd/ksh93/sh/init.c	2008-01-30 07:57:19.000000000 +0100
@@ -198,6 +198,8 @@ static void put_optindex(Namval_t* np,co
 	Shell_t *shp = ((struct shell*)fp)->sh;
 	shp->st.opterror = shp->st.optchar = 0;
 	nv_putv(np, val, flags, fp);
+	if(!val)
+		nv_disc(np,fp,NV_POP);
 }
 
 static Sfdouble_t nget_optindex(register Namval_t* np, Namfun_t *fp)


Index: ksh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ksh/F-8/ksh.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ksh.spec	7 Jan 2008 07:50:46 -0000	1.35
+++ ksh.spec	30 Jan 2008 07:44:30 -0000	1.36
@@ -8,7 +8,7 @@
 Group:        System Environment/Shells
 License:      Common Public License Version 1.0
 Version:      20071105
-Release:      2%{?dist}
+Release:      3%{?dist}
 Source0:      http://www.research.att.com/~gsf/download/tgz/ast-ksh.%{releasedate}.tgz
 Source1:      http://www.research.att.com/~gsf/download/tgz/INIT.%{releasedate}.tgz
 Source2:      http://www.research.att.com/~gsf/download/tgz/ast-ksh-locale.%{releasedate}.tgz
@@ -19,6 +19,7 @@
 Patch4:       ksh-20070328-ttou.patch
 Patch5:       ksh-20070628-unaligned.patch
 Patch6:       ksh-20071105-ifs.patch
+Patch7:       ksh-20071105-optind.patch
 # for debugging only:
 #Patch100:     ksh-20060124-iffedebug.patch
 
@@ -48,6 +49,7 @@
 %patch4 -p1 -b .ttou
 %patch5 -p1 -b .unaligned
 %patch6 -p1 -b .ifs
+%patch7 -p1 -b .optind
 #patch100 -p1 -b .iffedebug
 
 %build
@@ -106,6 +108,9 @@
     rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Jan 30 2008 Tomas Smetana <tsmetana at redhat.com> 20071105-3
+- fix #430602 - ksh segfaults after unsetting OPTIND
+
 * Mon Jan 07 2008 Tomas Smetana <tsmetana at redhat.com> 20071105-2
 - fix #405381 - ksh will not handle $(xxx) when typeset -r IFS
 - fix #386501 - bad group in spec file




More information about the fedora-extras-commits mailing list