Export from split WIM

[wimlib] / src / security.c

diff --git a/src/security.c b/src/security.c
index 99f09134c18678aeea79a8adf49ea314276129c6..6f0152eae734f8a150bd48a179c4d9939b978b45 100644 (file)
--- a/src/security.c
+++ b/src/security.c
@@ -11,16 +11,16 @@
  * This file is part of wimlib, a library for working with WIM files.
  *
  * wimlib is free software; you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
+ * terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option)
  * any later version.
  *
  * wimlib is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more
  * details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with wimlib; if not, see http://www.gnu.org/licenses/.
  */
 
@@ -61,7 +61,13 @@ int read_security_data(const u8 metadata_resource[], u64 metadata_resource_len,
 
        p = metadata_resource;
        p = get_u32(p, &sd->total_length);
-       p = get_u32(p, &sd->num_entries);
+       p = get_u32(p, (u32*)&sd->num_entries);
+
+       if (sd->num_entries > 0x7fffffff) {
+               ERROR("Security data has too many entries!");
+               ret = WIMLIB_ERR_INVALID_SECURITY_DATA;
+               goto out_free_sd;
+       }
 
        /* Verify the listed total length of the security data is big enough to
         * include the sizes array, verify that the file data is big enough to
@@ -75,7 +81,7 @@ int read_security_data(const u8 metadata_resource[], u64 metadata_resource_len,
                ERROR("Security data total length (%u) is bigger than the "
                      "metadata resource length (%"PRIu64")",
                      sd->total_length, metadata_resource_len);
-               ret = WIMLIB_ERR_INVALID_RESOURCE_SIZE;
+               ret = WIMLIB_ERR_INVALID_SECURITY_DATA;
                goto out_free_sd;
        }
 
@@ -94,7 +100,7 @@ int read_security_data(const u8 metadata_resource[], u64 metadata_resource_len,
                ERROR("Security data total length of %u is too short because "
                      "there must be at least %"PRIu64" bytes of security data",
                      sd->total_length, 8 + sizes_size);
-               ret = WIMLIB_ERR_INVALID_RESOURCE_SIZE;
+               ret = WIMLIB_ERR_INVALID_SECURITY_DATA;
                goto out_free_sd;
        }
        sd->sizes = MALLOC(sizes_size);
@@ -133,7 +139,7 @@ int read_security_data(const u8 metadata_resource[], u64 metadata_resource_len,
                        ERROR("Security data total length of %u is too short "
                              "because there are at least %"PRIu64" bytes of "
                              "security data", sd->total_length, total_len);
-                       ret = WIMLIB_ERR_INVALID_RESOURCE_SIZE;
+                       ret = WIMLIB_ERR_INVALID_SECURITY_DATA;
                        goto out_free_sd;
                }
                sd->descriptors[i] = MALLOC(sd->sizes[i]);
@@ -162,8 +168,10 @@ u8 *write_security_data(const struct wim_security_data *sd, u8 *p)
        DEBUG("Writing security data (total_length = %"PRIu32", num_entries "
              "= %"PRIu32")", sd->total_length, sd->num_entries);
 
+       u32 aligned_length = (sd->total_length + 7) & ~7;
+
        u8 *orig_p = p;
-       p = put_u32(p, sd->total_length);
+       p = put_u32(p, aligned_length);
        p = put_u32(p, sd->num_entries);
 
        for (u32 i = 0; i < sd->num_entries; i++)
@@ -173,6 +181,7 @@ u8 *write_security_data(const struct wim_security_data *sd, u8 *p)
                p = put_bytes(p, sd->sizes[i], sd->descriptors[i]);
 
        wimlib_assert(p - orig_p == sd->total_length);
+       p = put_zeroes(p, aligned_length - sd->total_length);
 
        DEBUG("Successfully wrote security data.");
        return p;