Save original xml_data only when needed

diff --git a/src/wim.c b/src/wim.c
index a5044c68b2200e694c8afcde4688dac9a403f3ef..9bc025562cfa17289e639f972372ca4bbfd8a833 100644 (file)
--- a/src/wim.c
+++ b/src/wim.c
@@ -470,8 +470,7 @@ begin_read(WIMStruct *w, const tchar *in_wim_path, int open_flags,
        if (ret)
                return ret;
 
        if (ret)
                return ret;
 

-       ret = read_xml_data(w->fp, &w->hdr.xml_res_entry,
-                           &w->xml_data, &w->wim_info);
+       ret = read_xml_data(w->fp, &w->hdr.xml_res_entry, &w->wim_info);

        if (ret)
                return ret;
 
        if (ret)
                return ret;
 


@@ -664,7 +663,6 @@ wimlib_free(WIMStruct *w)
        free_lookup_table(w->lookup_table);
 
        FREE(w->filename);
        free_lookup_table(w->lookup_table);
 
        FREE(w->filename);

-       FREE(w->xml_data);

        free_wim_info(w->wim_info);
        if (w->image_metadata) {
                for (unsigned i = 0; i < w->hdr.image_count; i++)
        free_wim_info(w->wim_info);
        if (w->image_metadata) {
                for (unsigned i = 0; i < w->hdr.image_count; i++)

diff --git a/src/wimlib_internal.h b/src/wimlib_internal.h
index 6396c00ad03776dfaff463a80541182cb0a90eb5..8f4d295804873a3046b7f94680e47145b6f9aea3 100644 (file)
--- a/src/wimlib_internal.h
+++ b/src/wimlib_internal.h
@@ -295,9 +295,6 @@ struct WIMStruct {
        /* The lookup table for the WIM file. */
        struct wim_lookup_table *lookup_table;
 
        /* The lookup table for the WIM file. */
        struct wim_lookup_table *lookup_table;
 

-       /* Pointer to the XML data read from the WIM file (UTF16LE-encoded). */
-       utf16lechar *xml_data;
-

        /* Information retrieved from the XML data, arranged in an orderly
         * manner. */
        struct wim_info *wim_info;
        /* Information retrieved from the XML data, arranged in an orderly
         * manner. */
        struct wim_info *wim_info;

diff --git a/src/xml.c b/src/xml.c
index ff37757f64972a052e7634eb8a9b07488d2ba746..f189183382c4a3bde7e9c0c7948dc7f177bd5c8b 100644 (file)
--- a/src/xml.c
+++ b/src/xml.c
@@ -1237,7 +1237,7 @@ libxml_global_cleanup()
  */
 int
 read_xml_data(FILE *fp, const struct resource_entry *res_entry,
  */
 int
 read_xml_data(FILE *fp, const struct resource_entry *res_entry,

-             utf16lechar **xml_data_ret, struct wim_info **info_ret)
+             struct wim_info **info_ret)

 {
        utf16lechar *xml_data;
        xmlDoc *doc;
 {
        utf16lechar *xml_data;
        xmlDoc *doc;


@@ -1267,7 +1267,7 @@ read_xml_data(FILE *fp, const struct resource_entry *res_entry,
 
        ret = read_uncompressed_resource(fp, res_entry->offset,
                                         res_entry->size, xml_data);
 
        ret = read_uncompressed_resource(fp, res_entry->offset,
                                         res_entry->size, xml_data);

-       if (ret != 0)
+       if (ret)

                goto out_free_xml_data;
 
        /* Null-terminate just in case */
                goto out_free_xml_data;
 
        /* Null-terminate just in case */


@@ -1300,13 +1300,7 @@ read_xml_data(FILE *fp, const struct resource_entry *res_entry,
                ret = WIMLIB_ERR_XML;
                goto out_free_doc;
        }
                ret = WIMLIB_ERR_XML;
                goto out_free_doc;
        }

-

        ret = xml_read_wim_info(root, info_ret);
        ret = xml_read_wim_info(root, info_ret);

-       if (ret != 0)
-               goto out_free_doc;
-
-       *xml_data_ret = xml_data;
-       xml_data = NULL;

 out_free_doc:
        DEBUG("Freeing XML tree.");
        xmlFreeDoc(doc);
 out_free_doc:
        DEBUG("Freeing XML tree.");
        xmlFreeDoc(doc);


@@ -1493,15 +1487,33 @@ WIMLIBAPI int
 wimlib_extract_xml_data(WIMStruct *w, FILE *fp)
 {
        size_t bytes_written;
 wimlib_extract_xml_data(WIMStruct *w, FILE *fp)
 {
        size_t bytes_written;

+       size_t size;
+       void *buf;
+       int ret;

 
 

-       if (!w->xml_data)
-               return WIMLIB_ERR_INVALID_PARAM;
-       bytes_written = fwrite(w->xml_data, 1, w->hdr.xml_res_entry.size, fp);
-       if (bytes_written != w->hdr.xml_res_entry.size) {
+       size = w->hdr.xml_res_entry.size;
+       if (sizeof(size_t) < sizeof(u64))
+               if (size != w->hdr.xml_res_entry.size)
+                       return WIMLIB_ERR_INVALID_PARAM;
+
+       buf = MALLOC(size);
+       if (!buf)
+               return WIMLIB_ERR_NOMEM;
+
+       ret = read_uncompressed_resource(w->fp, w->hdr.xml_res_entry.offset,
+                                        size, buf);
+       if (ret)
+               goto out_free_buf;
+
+       if (fwrite(buf, 1, size, fp) != size) {

                ERROR_WITH_ERRNO("Failed to extract XML data");
                ERROR_WITH_ERRNO("Failed to extract XML data");

-               return WIMLIB_ERR_WRITE;
+               ret = WIMLIB_ERR_WRITE;
+       } else {
+               ret = 0;

        }
        }

-       return 0;
+out_free_buf:
+       FREE(buf);
+       return ret;

 }
 
 /* Sets the name of an image in the WIM. */
 }
 
 /* Sets the name of an image in the WIM. */

diff --git a/src/xml.h b/src/xml.h
index 070dada51e5b0bcbfb0906f916df46d2cc8f6c0f..80965faf27e4e7779ca57132fb80807511a6d9c1 100644 (file)
--- a/src/xml.h
+++ b/src/xml.h
@@ -39,7 +39,6 @@ print_image_info(const struct wim_info *wim_info, int image);
 
 extern int
 read_xml_data(FILE *fp, const struct resource_entry *res,
 
 extern int
 read_xml_data(FILE *fp, const struct resource_entry *res,

-             utf16lechar **xml_data_ret,

              struct wim_info **info_ret);
 
 extern int
              struct wim_info **info_ret);
 
 extern int