Do not dereference null pointer in cwd

This commit is contained in:
Vojtech Vitek (V-Teq) 2011-10-27 21:11:50 +02:00
parent ff523ef24c
commit 5a75b9b1c0
2 changed files with 16 additions and 0 deletions

View File

@ -0,0 +1,12 @@
diff -up tcsh-6.17.00/sh.proc.c.bz607368 tcsh-6.17.00/sh.proc.c
--- tcsh-6.17.00/sh.proc.c.bz607368 2011-04-28 14:14:24.000000000 +0900
+++ tcsh-6.17.00/sh.proc.c 2011-04-28 14:14:55.000000000 +0900
@@ -367,7 +367,7 @@ found:
#ifdef notdef
jobflags & PAEXITED ||
#endif /* notdef */
- !eq(dcwd->di_name, fp->p_cwd->di_name))) {
+ fp->p_cwd == NULL || !eq(dcwd->di_name, fp->p_cwd->di_name))) {
/* PWP: print a newline after ^C */
if (jobflags & PINTERRUPTED) {
xputchar('\r' | QUOTE);

View File

@ -32,6 +32,8 @@ Patch21: tcsh-6.17.00-dont-set-empty-remotehost.patch
Patch22: tcsh-6.17.00-dont-print-history-on-verbose.patch
# Accepted by upstream:
Patch23: tcsh-6.17.00-extrafork.patch
# Proposed to upstream (http://bugs.gw.com/view.php?id=122):
Patch24: tcsh-6.17.00-avoid-null-cwd.patch
# Accepted by upstream (tcsh-6.17.03b http://bugs.gw.com/view.php?id=113):
Patch26: tcsh-6.17.00-variable-names.patch
# Accepted by upstream (tcsh-6.17.05b http://mx.gw.com/pipermail/tcsh-bugs/2011-March/000727.html):
@ -74,6 +76,7 @@ like syntax.
%patch21 -p1 -b .dont-set-empty-remotehost
%patch22 -p1 -b .dont-print-history-on-verbose
%patch23 -p1 -b .extrafork
%patch24 -p1 -b .avoid-null-cwd
%patch26 -p1 -b .variable-names
%patch28 -p1 -b .avoid-infinite-loop-pendjob-xprintf
@ -149,6 +152,7 @@ fi
%{_mandir}/man1/*.1*
%changelog
- Do not dereference null pointer in cwd (RHEL-6 #700309)
- Fix negative number of jobs with %%j formatting parameter in prompt
- Clean-up patches numbers & order (prepare space for missing RHEL-6 patches)
- Disable obsolete glob-automount.patch; The issue should have been