/*
* 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
/* 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
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;
}