SOURCES: gzip-CVE-2005-0988.patch (NEW) - RH's gzip-1.3.5-chmod.patch

[qboosh]

Author: qboosh                       Date: Wed Jun 21 12:21:03 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- RH's gzip-1.3.5-chmod.patch

---- Files affected:
SOURCES:
   gzip-CVE-2005-0988.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/gzip-CVE-2005-0988.patch
diff -u /dev/null SOURCES/gzip-CVE-2005-0988.patch:1.1
--- /dev/null	Wed Jun 21 14:21:03 2006
+++ SOURCES/gzip-CVE-2005-0988.patch	Wed Jun 21 14:20:58 2006
@@ -0,0 +1,46 @@
+diff -ur gzip-1.3.5.orig/gzip.c gzip-1.3.5/gzip.c
+--- gzip-1.3.5.orig/gzip.c	2005-04-14 09:25:04.941018504 -0400
++++ gzip-1.3.5/gzip.c	2005-04-14 09:33:36.966178848 -0400
+@@ -881,8 +881,11 @@
+     }
+ 
+     close(ifd);
+-    if (!to_stdout && close(ofd)) {
+-	write_error();
++    if (!to_stdout) {
++        /* Copy modes, times, ownership, and remove the input file */
++        copy_stat(&istat);
++        if (close(ofd))
++	    write_error();
+     }
+     if (method == -1) {
+ 	if (!to_stdout) xunlink (ofname);
+@@ -902,10 +905,6 @@
+ 	}
+ 	fprintf(stderr, "\n");
+     }
+-    /* Copy modes, times, ownership, and remove the input file */
+-    if (!to_stdout) {
+-	copy_stat(&istat);
+-    }
+ }
+ 
+ /* ========================================================================
+@@ -1731,7 +1730,7 @@
+     reset_times(ofname, ifstat);
+ #endif
+     /* Copy the protection modes */
+-    if (chmod(ofname, ifstat->st_mode & 07777)) {
++    if (fchmod(ofd, ifstat->st_mode & 07777)) {
+ 	int e = errno;
+ 	WARN((stderr, "%s: ", progname));
+ 	if (!quiet) {
+@@ -1740,7 +1739,7 @@
+ 	}
+     }
+ #ifndef NO_CHOWN
+-    chown(ofname, ifstat->st_uid, ifstat->st_gid);  /* Copy ownership */
++    (void) fchown(ofd, ifstat->st_uid, ifstat->st_gid);  /* Copy ownership */
+ #endif
+     remove_ofname = 0;
+     /* It's now safe to remove the input file: */
================================================================