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: 13-May-2009 20:31:14
Branch: HEAD Handle: 2009051318311300
Modified files:
rpm CHANGES
rpm/lib poptALL.c
Log:
- rpmds: dereference/flush global items earlier, before pool teardown.
Summary:
Revision Changes Path
1.2983 +1 -0 rpm/CHANGES
2.130 +3 -2 rpm/lib/poptALL.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2982 -r1.2983 CHANGES
--- rpm/CHANGES 13 May 2009 16:44:23 -0000 1.2982
+++ rpm/CHANGES 13 May 2009 18:31:13 -0000 1.2983
@@ -1,5 +1,6 @@
5.2b1 -> 5.3a1
+ - jbj: rpmds: dereference/flush global items earlier, before pool
teardown.
- jbj: rpmds: use _rpmdsPool, not heap, for rpmdsThis/rpmdsSingle as
well.
- jbj: rpmds: fix: rpmdsThis/rpmdsSingle assume ds->i = 0
(i.e. actively iterating).
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/poptALL.c
============================================================================
$ cvs diff -u -r2.129 -r2.130 poptALL.c
--- rpm/lib/poptALL.c 2 May 2009 20:06:28 -0000 2.129
+++ rpm/lib/poptALL.c 13 May 2009 18:31:13 -0000 2.130
@@ -527,6 +527,9 @@
_rpmfcPool = rpmioFreePool(_rpmfcPool);
_rpmsxPool = rpmioFreePool(_rpmsxPool);
+
+ rpmnsClean();
+
_rpmdsPool = rpmioFreePool(_rpmdsPool);
_rpmfiPool = rpmioFreePool(_rpmfiPool);
@@ -543,8 +546,6 @@
rpmFreeRpmrc(); /* XXX mireFreeAll(platpat) before rpmioFreePool. */
- rpmnsClean();
-
rpmFreeFilesystems();
/*...@i@*/ rpmcliTargets = _free(rpmcliTargets);
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
