Fixes

[wimlib] / src / wim.c

diff --git a/src/wim.c b/src/wim.c
index ed20145e2b452aad3ce511b5f5f754aecf6b269b..8f579f2ce3f4cc33d75cd7e1ef88263a965814f5 100644 (file)
--- a/src/wim.c
+++ b/src/wim.c
@@ -199,6 +199,7 @@ select_wim_image(WIMStruct *w, int image)
        if (w->current_image != WIMLIB_NO_IMAGE) {
                imd = wim_get_current_image_metadata(w);
                if (!imd->modified) {
+                       wimlib_assert(list_empty(&imd->unhashed_streams));
                        DEBUG("Freeing image %u", w->current_image);
                        destroy_image_metadata(imd, NULL, false);
                }
@@ -532,8 +533,13 @@ destroy_image_metadata(struct wim_image_metadata *imd,
                free_lookup_table_entry(imd->metadata_lte);
                imd->metadata_lte = NULL;
        }
+       if (!table) {
+               struct wim_lookup_table_entry *lte, *tmp;
+               list_for_each_entry_safe(lte, tmp, &imd->unhashed_streams, unhashed_list)
+                       free_lookup_table_entry(lte);
+       }
        INIT_LIST_HEAD(&imd->unhashed_streams);
-       INIT_HLIST_HEAD(&imd->inode_list);
+       INIT_LIST_HEAD(&imd->inode_list);
 }
 
 void
@@ -574,7 +580,7 @@ new_image_metadata()
        imd = CALLOC(1, sizeof(*imd));
        if (imd) {
                imd->refcnt = 1;
-               INIT_HLIST_HEAD(&imd->inode_list);
+               INIT_LIST_HEAD(&imd->inode_list);
                INIT_LIST_HEAD(&imd->unhashed_streams);
                DEBUG("Created new image metadata (refcnt=1)");
        } else {
@@ -610,6 +616,24 @@ new_image_metadata_array(unsigned num_images)
        return imd_array;
 }
 
+int
+wim_checksum_unhashed_streams(WIMStruct *w)
+{
+       int ret;
+       for (int i = 0; i < w->hdr.image_count; i++) {
+               struct wim_lookup_table_entry *lte, *tmp;
+               list_for_each_entry_safe(lte, tmp,
+                                        &w->image_metadata[i]->unhashed_streams,
+                                        unhashed_list)
+               {
+                       ret = hash_unhashed_stream(lte, w->lookup_table, NULL);
+                       if (ret)
+                               return ret;
+               }
+       }
+       return 0;
+}
+
 /* Frees the memory for the WIMStruct, including all internal memory; also
  * closes all files associated with the WIMStruct.  */
 WIMLIBAPI void