]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
Fix libarchive/archive_read_support_format_mtree.c:1388:11: error: array subscript... 715/head
authormfont <mfont@worldsensing.com>
Fri, 10 Jun 2016 14:54:43 +0000 (16:54 +0200)
committermfont <mfont@worldsensing.com>
Fri, 10 Jun 2016 14:54:43 +0000 (16:54 +0200)
libarchive/archive_read_support_format_mtree.c

index 3efcc37837e6193090aac6723deaa21a05bb5e6c..8c3be9a294f8789c2d32756ae6f0ae16461e37ab 100644 (file)
@@ -1385,12 +1385,12 @@ parse_device(dev_t *pdev, struct archive *a, char *val)
                                    "Missing number");
                                return ARCHIVE_WARN;
                        }
-                       numbers[argc++] = (unsigned long)mtree_atol(&p);
-                       if (argc > MAX_PACK_ARGS) {
+                       if (argc >= MAX_PACK_ARGS) {
                                archive_set_error(a, ARCHIVE_ERRNO_FILE_FORMAT,
                                    "Too many arguments");
                                return ARCHIVE_WARN;
                        }
+                       numbers[argc++] = (unsigned long)mtree_atol(&p);
                }
                if (argc < 2) {
                        archive_set_error(a, ARCHIVE_ERRNO_FILE_FORMAT,