win32_capture: correctly handle unspecified security IDs in MFT

[wimlib] / src / add_image.c

diff --git a/src/add_image.c b/src/add_image.c
index 86ba9f0b3d277ede7bb588ba2baf57e754783907..b4eb0a9eda46de114a0a04b266b6ab3ee13f1b32 100644 (file)
--- a/src/add_image.c
+++ b/src/add_image.c
@@ -24,8 +24,8 @@
 #endif
 
 #include "wimlib.h"
+#include "wimlib/blob_table.h"
 #include "wimlib/error.h"
-#include "wimlib/lookup_table.h"
 #include "wimlib/metadata.h"
 #include "wimlib/security.h"
 #include "wimlib/xml.h"
@@ -38,24 +38,23 @@ static int
 add_empty_image_metadata(WIMStruct *wim)
 {
        int ret;
-       struct wim_lookup_table_entry *metadata_lte;
+       struct blob_descriptor *metadata_blob;
        struct wim_security_data *sd;
        struct wim_image_metadata *imd;
 
-       /* Create lookup table entry for this metadata resource (for now really
-        * just a dummy entry).  */
+       /* Create a blob descriptor for the new metadata resource.  */
        ret = WIMLIB_ERR_NOMEM;
-       metadata_lte = new_lookup_table_entry();
-       if (!metadata_lte)
+       metadata_blob = new_blob_descriptor();
+       if (!metadata_blob)
                goto out;
 
-       metadata_lte->flags = WIM_RESHDR_FLAG_METADATA;
-       metadata_lte->unhashed = 1;
+       metadata_blob->refcnt = 1;
+       metadata_blob->is_metadata = 1;
 
        /* Create empty security data (no security descriptors).  */
        sd = new_wim_security_data();
        if (!sd)
-               goto out_free_metadata_lte;
+               goto out_free_metadata_blob;
 
        imd = new_image_metadata();
        if (!imd)
@@ -64,9 +63,8 @@ add_empty_image_metadata(WIMStruct *wim)
        /* A NULL root_dentry indicates a completely empty image, without even a
         * root directory.  */
        imd->root_dentry = NULL;
-       imd->metadata_lte = metadata_lte;
+       imd->metadata_blob = metadata_blob;
        imd->security_data = sd;
-       imd->modified = 1;
 
        /* Append as next image index.  */
        ret = append_image_metadata(wim, imd);
@@ -76,8 +74,8 @@ add_empty_image_metadata(WIMStruct *wim)
 
 out_free_security_data:
        free_wim_security_data(sd);
-out_free_metadata_lte:
-       free_lookup_table_entry(metadata_lte);
+out_free_metadata_blob:
+       free_blob_descriptor(metadata_blob);
 out:
        return ret;
 }
@@ -88,9 +86,6 @@ wimlib_add_empty_image(WIMStruct *wim, const tchar *name, int *new_idx_ret)
 {
        int ret;
 
-       if (!name)
-               name = T("");
-
        if (wimlib_image_name_in_use(wim, name)) {
                ERROR("There is already an image named \"%"TS"\" in the WIM!",
                      name);
@@ -101,7 +96,7 @@ wimlib_add_empty_image(WIMStruct *wim, const tchar *name, int *new_idx_ret)
        if (ret)
                return ret;
 
-       ret = xml_add_image(wim, name);
+       ret = xml_add_image(wim->xml_info, name);
        if (ret) {
                put_image_metadata(wim->image_metadata[--wim->hdr.image_count],
                                   NULL);
@@ -180,14 +175,17 @@ wimlib_add_image_multisource(WIMStruct *wim,
        if (ret)
                goto out_delete_image;
 
+       /* If requested, mark the new image as WIMBoot-compatible.  */
+       if (add_flags & WIMLIB_ADD_FLAG_WIMBOOT) {
+               ret = xml_set_wimboot(wim->xml_info, wim->hdr.image_count);
+               if (ret)
+                       goto out_delete_image;
+       }
+
        /* If requested, set this image as the WIM's bootable image.  */
        if (add_flags & WIMLIB_ADD_FLAG_BOOT)
                wim->hdr.boot_idx = wim->hdr.image_count;
 
-       /* If requested, mark new image as WIMBoot-compatible.  */
-       if (add_flags & WIMLIB_ADD_FLAG_WIMBOOT)
-               wim_info_set_wimboot(wim->wim_info, wim->hdr.image_count, true);
-
        return 0;
 
 out_delete_image: