RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 16-Feb-2011 04:43:34
Branch: rpm-5_4 Handle: 2011021603433301
Modified files: (Branch: rpm-5_4)
rpm CHANGES
rpm/lib rpmrc.c
Log:
- rpmrc: fix: add missing nref++ on rpmdsFromPRCO() return segfault.
Summary:
Revision Changes Path
1.3501.2.59 +1 -0 rpm/CHANGES
2.289.4.1 +1 -1 rpm/lib/rpmrc.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.58 -r1.3501.2.59 CHANGES
--- rpm/CHANGES 14 Feb 2011 01:54:22 -0000 1.3501.2.58
+++ rpm/CHANGES 16 Feb 2011 03:43:33 -0000 1.3501.2.59
@@ -1,4 +1,5 @@
5.4.0 -> 5.4.1:
+ - jbj: rpmrc: fix: add missing nref++ on rpmdsFromPRCO() return segfault.
- proyvind: set mi->mi_count when rpmmiNext() initializes db cursor so
that
rpmmiCount() won't break (mdvbz#62267)
- proyvind: fix rpmmiCount() not resetting db cursor after use, breaking
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmrc.c
============================================================================
$ cvs diff -u -r2.289 -r2.289.4.1 rpmrc.c
--- rpm/lib/rpmrc.c 10 Dec 2009 18:52:18 -0000 2.289
+++ rpm/lib/rpmrc.c 16 Feb 2011 03:43:34 -0000 2.289.4.1
@@ -1206,7 +1206,7 @@
if (rpmIsVerbose()) {
rpmPRCO PRCO = rpmdsNewPRCO(NULL);
xx = rpmdsSysinfo(PRCO, NULL);
- ds = rpmdsFromPRCO(PRCO, RPMTAG_PROVIDENAME);
+ ds = rpmdsLink(rpmdsFromPRCO(PRCO, RPMTAG_PROVIDENAME), "PRCO");
if (ds != NULL) {
const char * fn = (_sysinfo_path ? _sysinfo_path :
"/etc/rpm/sysinfo");
fprintf(fp, _("Configured system provides (from %s):\n"), fn);
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
