RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: rpm Date: 27-May-2011 15:50:13
Branch: rpm-5_4 Handle: 2011052713501201
Modified files: (Branch: rpm-5_4)
rpm CHANGES
rpm/rpmdb fprint.c
Log:
In fpLookupSubdir, data returned by hash should be of type
"struct rpmffi_s **" instead of "struct rpmffi_s *" to avoid
segfault. Patch by Qing He.
Summary:
Revision Changes Path
1.3501.2.133+3 -0 rpm/CHANGES
1.40.4.1 +3 -3 rpm/rpmdb/fprint.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.132 -r1.3501.2.133 CHANGES
--- rpm/CHANGES 24 May 2011 10:48:50 -0000 1.3501.2.132
+++ rpm/CHANGES 27 May 2011 13:50:12 -0000 1.3501.2.133
@@ -1,4 +1,7 @@
5.4.0 -> 5.4.1:
+ - devzero2000: In fpLookupSubdir, data returned by hash should be of type
+ "struct rpmffi_s **" instead of "struct rpmffi_s *" to avoid
+ segfault. Patch by Qing He.
- devzero2000: added gcc-c++ in devtool.conf for fedora (required by
beecrypt)
- devzero2000: added fedora per platform macro from redhat-rpm-config
- devzero2000: added suse to the per vendor change configure.ac enabler
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/fprint.c
============================================================================
$ cvs diff -u -r1.40 -r1.40.4.1 fprint.c
--- rpm/rpmdb/fprint.c 6 Mar 2010 16:20:46 -0000 1.40
+++ rpm/rpmdb/fprint.c 27 May 2011 13:50:13 -0000 1.40.4.1
@@ -333,7 +333,7 @@
*te = '\0';
while (te < se) {
- struct rpmffi_s * recs;
+ struct rpmffi_s ** recs;
int numRecs;
int i;
@@ -346,8 +346,8 @@
const char * link;
int fx;
- fx = recs[i].fileno;
- fi = recs[i].p->fi;
+ fx = recs[i]->fileno;
+ fi = recs[i]->p->fi;
flink = fi->flinks[fx];
if (!(flink && *flink != '\0'))
continue;
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
