RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarlsen@rpm5.org
Module: rpm Date: 09-Dec-2007 05:18:33
Branch: rpm-4_5 Handle: 2007120904183300
Modified files: (Branch: rpm-4_5)
rpm/rpmdb header.c
Log:
fix rpm -K segfaulting on corrupted header
(http://qa.mandriva.com/show_bug.cgi?id=33735)
Summary:
Revision Changes Path
1.48.2.21 +1 -1 rpm/rpmdb/header.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmdb/header.c
============================================================================
$ cvs diff -u -r1.48.2.20 -r1.48.2.21 header.c
--- rpm/rpmdb/header.c 26 Oct 2007 20:52:09 -0000 1.48.2.20
+++ rpm/rpmdb/header.c 9 Dec 2007 04:18:33 -0000 1.48.2.21
@@ -1493,7 +1493,7 @@
dataStart = (unsigned char *) memcpy(pe + ril, dataStart, rdl);
/*@=sizeoftype@*/
- rc = regionSwab(NULL, ril, 0, pe, dataStart, NULL, 0);
+ rc = regionSwab(NULL, ril, 0, pe, dataStart, dataStart + rdl, 0);
/* XXX 1 on success. */
rc = (rc < 0) ? 0 : 1;
} else {
@@ .
Received on Sun Dec 9 05:18:33 2007