RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 07-Jun-2011 15:17:20
Branch: rpm-5_3 Handle: 2011060713171901
Modified files: (Branch: rpm-5_3)
rpm CHANGES
rpm/rpmdb fprint.c
Log:
data returned by hash should be of type "struct rpmffi_s **"i instead of
"struct rpmffi_s *" to avoid segfault. Patch by Qing He.
Summary:
Revision Changes Path
1.3296.2.237+3 -0 rpm/CHANGES
1.40.2.1 +3 -3 rpm/rpmdb/fprint.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3296.2.236 -r1.3296.2.237 CHANGES
--- rpm/CHANGES 7 Jun 2011 13:13:30 -0000 1.3296.2.236
+++ rpm/CHANGES 7 Jun 2011 13:17:19 -0000 1.3296.2.237
@@ -1,4 +1,7 @@
5.3.12 -> 5.3.13
+ - 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.
- proyvind: don't pick up python version from python egg, rely on path
only in stead to avoid incorrect version dependencies if any other
egg metadata for other versions is found.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/fprint.c
============================================================================
$ cvs diff -u -r1.40 -r1.40.2.1 fprint.c
--- rpm/rpmdb/fprint.c 6 Mar 2010 16:20:46 -0000 1.40
+++ rpm/rpmdb/fprint.c 7 Jun 2011 13:17:20 -0000 1.40.2.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
