Revert "read_wim_lookup_table(): Make sure all resources get validated"
authorEric Biggers <ebiggers3@gmail.com>
Tue, 29 Apr 2014 02:39:57 +0000 (21:39 -0500)
committerEric Biggers <ebiggers3@gmail.com>
Tue, 29 Apr 2014 02:39:57 +0000 (21:39 -0500)
This reverts commit dfba747e4324c0922f58ec03a84eb9c0b03f8f66.

src/lookup_table.c

index d42826d..8c394f7 100644 (file)
@@ -811,10 +811,10 @@ read_wim_lookup_table(WIMStruct *wim)
                 *   wimlib does not currently allow create WIMs with multiple
                 *   packed resources, as to remain compatible with WIMGAPI.)
                 */
-               if (likely(!(reshdr.flags & WIM_RESHDR_FLAG_PACKED_STREAMS))
-                   || !cur_rspec
-                   || (reshdr.uncompressed_size == WIM_PACK_MAGIC_NUMBER &&
-                       cur_rspec->size_in_wim != 0))
+               if (likely(!cur_rspec) ||
+                   !(reshdr.flags & WIM_RESHDR_FLAG_PACKED_STREAMS) ||
+                     (reshdr.uncompressed_size == WIM_PACK_MAGIC_NUMBER &&
+                      cur_rspec->size_in_wim != 0))
                {
                        /* Finish previous resource (if existent)  */
                        if (cur_rspec) {
@@ -974,6 +974,7 @@ read_wim_lookup_table(WIMStruct *wim)
                        cur_entry->offset_in_res = 0;
                        cur_entry->size = reshdr.uncompressed_size;
                        cur_entry->flags = reshdr.flags;
+                       cur_rspec = NULL;
                }
                continue;