SOURCES (rpm-4_4_9): rpm-rpm5-patchset-10061.patch - fix segfault in deploo...

draenog draenog at pld-linux.org
Wed Oct 1 14:14:33 CEST 2008


Author: draenog                      Date: Wed Oct  1 12:14:33 2008 GMT
Module: SOURCES                       Tag: rpm-4_4_9
---- Log message:
- fix segfault in deploop diagnostic message

---- Files affected:
SOURCES:
   rpm-rpm5-patchset-10061.patch (1.1.2.1 -> 1.1.2.2) 

---- Diffs:

================================================================
Index: SOURCES/rpm-rpm5-patchset-10061.patch
diff -u SOURCES/rpm-rpm5-patchset-10061.patch:1.1.2.1 SOURCES/rpm-rpm5-patchset-10061.patch:1.1.2.2
--- SOURCES/rpm-rpm5-patchset-10061.patch:1.1.2.1	Mon Apr  7 20:57:18 2008
+++ SOURCES/rpm-rpm5-patchset-10061.patch	Wed Oct  1 14:14:28 2008
@@ -9,6 +9,15 @@
 rcsdiff -q -kk '-r1.392' '-r1.393' -u '/v/rpm/cvs/rpm/lib/depends.c,v' 2>/dev/null
 --- lib/depends.c	2008/03/17 09:50:01	1.392
 +++ lib/depends.c	2008/03/31 23:00:56	1.393
+@@ -1592,7 +1592,7 @@
+ 	    continue;
+ 	/*@=abstractcompare@*/
+ 
+-	requires = rpmteDS(p, tsi->tsi_tagn);
++	requires = rpmteDS((rpmteType(p) == TR_REMOVED ? q : p), tsi->tsi_tagn);
+ 	if (requires == NULL) continue;		/* XXX can't happen */
+ 
+ 	(void) rpmdsSetIx(requires, tsi->tsi_reqx);
 @@ -1882,6 +1882,13 @@
  	return 0;
      selected[i] = 1;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm-rpm5-patchset-10061.patch?r1=1.1.2.1&r2=1.1.2.2&f=u



More information about the pld-cvs-commit mailing list