mount_image.c: Replace use of zero-length array

[wimlib] / src / tagged_items.c

diff --git a/src/tagged_items.c b/src/tagged_items.c
index 6cd897fa7ae1bf167c7c4f6e21088b670d1a394c..86ad33e613a1490835510d6d91a3a500d7960115 100644 (file)
--- a/src/tagged_items.c
+++ b/src/tagged_items.c
@@ -8,20 +8,18 @@
 /*
  * Copyright (C) 2014 Eric Biggers
  *
- * This file is part of wimlib, a library for working with WIM files.
+ * This file 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 3 of the License, or (at your option) any
+ * later version.
  *
- * wimlib is free software; you can redistribute it and/or modify it under the
- * 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 General Public License for more
+ * This file 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
  * details.
  *
- * You should have received a copy of the GNU General Public License
- * along with wimlib; if not, see http://www.gnu.org/licenses/.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this file; if not, see http://www.gnu.org/licenses/.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -45,7 +43,7 @@ struct tagged_item_header {
        /* Unique identifier for this item.  */
        le32 tag;
 
-       /* Size of the data of this tagged item, in bytes.  This includes this
+       /* Size of the data of this tagged item, in bytes.  This excludes this
         * header and should be a multiple of 8.
         *
         * (Actually, the MS implementation seems to round this up to an 8 byte
@@ -98,10 +96,10 @@ inode_get_tagged_item(const struct wim_inode *inode,
                        return hdr->data;
 
                len = (len + 7) & ~7;
-               if (len >= len_remaining)
+               if (len_remaining <= sizeof(struct tagged_item_header) + len)
                        return NULL;
-               len_remaining -= len;
-               p = hdr->data + len;
+               len_remaining -= sizeof(struct tagged_item_header) + len;
+               p += sizeof(struct tagged_item_header) + len;
        }
        return NULL;
 }