Ugly hack

After exporting an image, an inode list may be shared between multiple images.
This is a fix to make deleting the inodes from the list still work when the list
head may have been freed already.

diff --git a/src/dentry.c b/src/dentry.c
index 978a825f25ec417342fff795ff9f2b68947b3e21..3847fbb2a6fd429dd2eb925c343679f9dcc7a48e 100644 (file)
--- a/src/dentry.c
+++ b/src/dentry.c
@@ -896,7 +896,7 @@ void free_inode(struct inode *inode)
                FREE(inode->fds);
                pthread_mutex_destroy(&inode->i_mutex);
                if (inode->hlist.pprev)
-                       hlist_del(&inode->hlist);
+                       hlist_safe_del(&inode->hlist);
        #endif
                FREE(inode->extracted_file);
                FREE(inode);

diff --git a/src/export_image.c b/src/export_image.c
index a24950ad30b3a8b9f81c7e3c60c4c8098bbc237a..58d6057ad3c567a9271de19cae217b97c5716ce2 100644 (file)
--- a/src/export_image.c
+++ b/src/export_image.c
@@ -234,6 +234,8 @@ WIMLIBAPI int wimlib_export_image(WIMStruct *src_wim,
 
        dest_wim->image_metadata[
                dest_wim->hdr.image_count - 1].inode_list = src_imd->inode_list;
+       if (src_imd->inode_list.first)
+               src_imd->inode_list.first->pprev = NULL;
 
        /* All memory allocations have been taken care of, so it's no longer
         * possible for this function to fail.  Go ahead and increment the

diff --git a/src/list.h b/src/list.h
index 82f08e5ff47e9e192777edfebc9358a590dcd119..ce2dad2c495d55910a935d4c27b0abba2cb5949a 100644 (file)
--- a/src/list.h
+++ b/src/list.h
@@ -195,6 +195,16 @@ static inline void hlist_del(struct hlist_node *n)
                next->pprev = pprev;
 }
 
+static inline void hlist_safe_del(struct hlist_node *n)
+{
+       struct hlist_node *next = n->next;
+       struct hlist_node **pprev = n->pprev;
+       if (pprev)
+               *pprev = next;
+       if (next)
+               next->pprev = pprev;
+}
+
 static inline void hlist_add_head(struct hlist_node *n, struct hlist_head *h)
 {
        struct hlist_node *first = h->first;

diff --git a/src/mount_image.c b/src/mount_image.c
index 69fad24468332471d7049e8707b6f4ef1349b320..090a828026e95e197180cf96bd8f4513125a9208 100644 (file)
--- a/src/mount_image.c
+++ b/src/mount_image.c
@@ -2370,6 +2370,9 @@ WIMLIBAPI int wimlib_mount_image(WIMStruct *wim, int image, const char *dir,
                goto out;
        }
 
+       if (imd->inode_list.first)
+               imd->inode_list.first->pprev = &imd->inode_list.first;
+
        if (imd->modified) {
                ERROR("Cannot mount image that was added "
                      "with wimlib_add_image()");