Changeset 4557

Timestamp:

07/27/08 08:42:19 (5 years ago)

Author:

tick

Message:

opkg: fix some memory leak and double free issues.

Location:

trunk/src/target/opkg/libopkg

Files:

• opkg_cmd.c (modified) (1 diff)
• opkg_remove.c (modified) (4 diffs)

trunk/src/target/opkg/libopkg/opkg_cmd.c

@@ -910 +910 @@
     done = 0;
 
-     available = pkg_vec_alloc();
      pkg_info_preinstall_check(conf);
      if ( argc > 0 ) {
+        available = pkg_vec_alloc();
         pkg_hash_fetch_all_installed(&conf->pkg_hash, available);
         for (i=0; i < argc; i++) {

trunk/src/target/opkg/libopkg/opkg_remove.c

@@ -91 +91 @@
     int a;
     int count;
-    pkg_vec_t *dependent_pkgs = pkg_vec_alloc();
+    pkg_vec_t *dependent_pkgs;
     abstract_pkg_t * ab_pkg;
 
@@ -111 +111 @@
     i = 0;
     count = 1;
+    dependent_pkgs = pkg_vec_alloc();
+
     while (dependents [i] != NULL) {
         abstract_pkg_t *dep_ab_pkg = dependents[i];
@@ -132 +134 @@
     }
     
-    if (count == 1)
-            return 0;
+    if (count == 1) {
+        free(dependent_pkgs);  
+        return 0;
+    }
     
     
+    int err=0;
     for (i = 0; i < dependent_pkgs->len; i++) {
-        int err = opkg_remove_pkg(conf, dependent_pkgs->pkgs[i],0);
+        err = opkg_remove_pkg(conf, dependent_pkgs->pkgs[i],0);
         if (err)
-            return err;
-    }
-    return 0;
+            break;
+    }
+    free(dependent_pkgs);
+    return err;
 }
 
@@ -269 +275 @@
                /* remove packages depending on this package - Karthik */
                err = opkg_remove_dependent_pkgs (conf, pkg, dependents);
-               free(dependents);
-               if (err) return err;
+               if (err) {
+                 free(dependents);
+                 return err;
+               }
           }
           if (dependents)