rpms/rpm/devel rpm-4.4.2.1-rc1-query-iterators.patch, NONE, 1.1 rpm.spec, 1.235, 1.236

[Panu Matilainen (pmatilai)]

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11141

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.4.2.1-rc1-query-iterators.patch 
Log Message:
- don't hang because of leftover query iterators (#246044)


rpm-4.4.2.1-rc1-query-iterators.patch:

--- NEW FILE rpm-4.4.2.1-rc1-query-iterators.patch ---
changeset:   6070:7ca081cd83d8
tag:         tip
user:        Panu Matilainen <pmatilai at redhat.com>
date:        Thu Jun 28 14:44:48 2007 +0300
summary:     Remember to free up match iterators (rhbz#246044)

diff -r a468a8443652 -r 7ca081cd83d8 lib/query.c
--- a/lib/query.c	Wed Jun 27 16:29:16 2007 +0300
+++ b/lib/query.c	Thu Jun 28 14:44:48 2007 +0300
@@ -680,10 +680,12 @@ int rpmQueryVerify(QVA_t qva, rpmts ts, 
     case RPMQV_PACKAGE:
     {
 	int matches = 0;
-	qva->qva_mi = rpmtsInitIterator(ts, RPMDBI_LABEL, arg, 0);
-	while (rpmdbNextIterator(qva->qva_mi) != NULL) {
+	rpmdbMatchIterator mi;
+	mi = rpmtsInitIterator(ts, RPMDBI_LABEL, arg, 0);
+	while (rpmdbNextIterator(mi) != NULL) {
 	    matches++;
 	}
+	rpmdbFreeIterator(mi);
 	if (! matches) {
 	    rpmError(RPMERR_QUERYINFO, _("package %s is not installed\n"), arg);
 	    res = 1;



Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -r1.235 -r1.236
--- rpm.spec	26 Jun 2007 11:15:57 -0000	1.235
+++ rpm.spec	28 Jun 2007 12:02:23 -0000	1.236
@@ -14,7 +14,7 @@
 Name: rpm
 Version: 4.4.2.1
 %{expand: %%define rpm_version %{version}-rc1}
-Release: 0.2.rc1
+Release: 0.3.rc1
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source: rpm-%{rpm_version}.tar.gz
@@ -25,6 +25,7 @@
 Patch5: rpm-4.4.2-rpmfc-skip.patch
 Patch6: rpm-4.4.2-matchpathcon.patch
 Patch7: rpm-4.4.2.1-rc1-poptver.patch
+Patch8: rpm-4.4.2.1-rc1-query-iterators.patch
 License: GPL
 Requires(pre): shadow-utils
 Requires(postun): shadow-utils
@@ -135,6 +136,7 @@
 %patch5 -p1 -b .fcskip
 %patch6 -p1 -b .matchpathcon
 %patch7 -p1 -b .poptver
+%patch8 -p1 -b .queryiter
 
 %build
 
@@ -429,6 +431,9 @@
 %{__includedir}/popt.h
 
 %changelog
+* Thu Jun 28 2007 Panu Matilainen <pmatilai at redhat.com> 4.4.2.1-0.3.rc1
+- don't hang because of leftover query iterators (#246044)
+
 * Tue Jun 26 2007 Panu Matilainen <pmatilai at redhat.com> 4.4.2.1-0.2.rc1
 - patch popt version to 1.10.2.1 for clean upgrade path
 - popt release follows main package release again