Changeset 4564

Timestamp:

07/30/08 16:01:54 (5 years ago)

Author:

tick

Message:

opkg: fix the crashing issue.

It's a hanging pointer.
Using installed_files without get and free

Location:

trunk/src/target/opkg/libopkg

Files:

• pkg.c (modified) (1 diff)
• pkg_hash.c (modified) (1 diff)
• void_list.c (modified) (1 diff)

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

@@ -1738 +1738 @@
                file_hash_set_file_owner(conf, installed_file, pkg);
           }
-          //FIXME: mark this line. Thid avoid crash, But the reference count shall be balanced. (If there are some delay after file_hash_set_file_owner, it wont crash (Pondering why?))
-          //pkg_free_installed_files(pkg);
+          pkg_free_installed_files(pkg);
      }
      pkg_vec_free(installed_pkgs);

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

@@ -649 +649 @@
      hash_table_insert(file_hash, file_name, owning_pkg); 
      if (old_owning_pkg) {
+          pkg_get_installed_files(old_owning_pkg);
           str_list_remove_elt(old_owning_pkg->installed_files, file_name);
+          pkg_free_installed_files(old_owning_pkg);
           /* mark this package to have its filelist written */
           old_owning_pkg->state_flag |= SF_FILELIST_CHANGED;
           owning_pkg->state_flag |= SF_FILELIST_CHANGED;
+          
      }
      return 0;

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

@@ -160 +160 @@
      void_list_elt_t *old_elt = NULL;
      void *old_data = NULL;
+
+     if (!list) {
+          fprintf(stderr, "Error: void_list_remove_elt list is NULL\n");
+          return NULL;
+     }
+     if (!target_data) {
+          fprintf(stderr, "Error: void_list_remove_elt target_data is NULL\n");
+          return NULL;
+     }
 
      /* first element */