Skip to contentSkip to conversation

rpmresolve.c: Fix unfreed pointers that keep DB opened

PATCH New [email protected] 1 participant 2 messages Dec 29, 2015

lore
Share & tools
lore

[email protected]

author
#0 lore raw

cover rpmresolve.c: Fix unfreed pointers that keep DB opened

From: Mariano Lopez <[email protected]>

When rpmresolve is used, it keeps the DB opened because of unfreed pointers. This patch solve this issue.

[YOCTO #8028]

The following changes since commit 2cd061a29a94fdcdfec86732e6bcbb71c12c4afc:

bluez5: include the patch only for 5.36 (2015-12-28 13:02:11 +0000)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib mariano/bug8028
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=mariano/bug8028

Mariano Lopez (1):
rpmresolve.c: Fix unfreed pointers that keep DB opened

 meta/recipes-devtools/rpm/rpmresolve/rpmresolve.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
Signature · 1 line
1.8.4.5
author
#1 lore raw

PATCH 1/1 rpmresolve.c: Fix unfreed pointers that keep DB opened

From: Mariano Lopez <[email protected]>

There are some unfreed rpmmi pointers in printDepList() function; this happens when the package have null as the requirement.

This patch fixes these unfreed pointers and add small changes to keep consistency with some variables.

[YOCTO #8028]

Signed-off-by Mariano Lopez <[email protected]>
---
 meta/recipes-devtools/rpm/rpmresolve/rpmresolve.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
meta/recipes-devtools/rpm/rpmresolve/rpmresolve.c +6 -4
index 7f4caf9..c0b4d56 100644
@@ -42,7 +42,7 @@ FILE *outf;
 int getPackageStr(rpmts ts, const char *NVRA, rpmTag tag, char **value)
 {
     int rc = -1;
-    rpmmi mi = rpmtsInitIterator(ts, RPMTAG_NVRA, NVRA, 0);
+    rpmmi mi = rpmmiInit(rpmtsGetRdb(ts), RPMTAG_NVRA, NVRA, 0);
     Header h;
     if ((h = rpmmiNext(mi)) != NULL) {
         HE_t he = (HE_t) memset(alloca(sizeof(*he)), 0, sizeof(*he));

@@ -225,7 +225,7 @@ int processPackages(rpmts *ts, int tscount, const char *packagelistfn, int ignor
 int lookupProvider(rpmts ts, const char *req, char **provider)
 {
     int rc = 0;
-    rpmmi provmi = rpmtsInitIterator(ts, RPMTAG_PROVIDENAME, req, 0);
+    rpmmi provmi = rpmmiInit(rpmtsGetRdb(ts), RPMTAG_PROVIDENAME, req, 0);
     if(provmi) {
         Header h;
         if ((h = rpmmiNext(provmi)) != NULL) {

@@ -266,7 +266,7 @@ int printDepList(rpmts *ts, int tscount)
         HE_t he = (HE_t) memset(alloca(sizeof(*he)), 0, sizeof(*he));
         int nkeys = argvCount(keys);
         for(i=0; i<nkeys; i++) {
-            rpmmi mi = rpmtsInitIterator(ts[0], RPMTAG_NVRA, keys[i], 0);
+            rpmmi mi = rpmmiInit(db, RPMTAG_NVRA, keys[i], 0);
             Header h;
             if ((h = rpmmiNext(mi)) != NULL) {
                 /* Get name of package */

@@ -280,6 +280,8 @@ int printDepList(rpmts *ts, int tscount)
                         printf("DEBUG: %s requires null\n", name);
                     }
                     rc = 0;
+                    free(name);
+                    (void)rpmmiFree(mi);
                     continue;
                 }
                 ARGV_t reqs = (ARGV_t)he->p.ptr;

@@ -412,7 +414,7 @@ int main(int argc, char **argv)
     }
 
     for(i=0; i<tscount; i++)
-        (void) rpmtsCloseDB(ts[i]);
+        (void)rpmtsFree(ts[i]);
     free(ts);
 
     if( outfile ) {
Signature · 1 line
1.8.4.5