]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
Use memcmp to find SP extension bytes
authorDan McGee <dan@archlinux.org>
Tue, 27 Mar 2012 22:06:10 +0000 (17:06 -0500)
committerDan McGee <dan@archlinux.org>
Tue, 27 Mar 2012 22:22:49 +0000 (17:22 -0500)
libarchive/archive_read_support_format_iso9660.c

index d38c7cfe7e42e162fe41b0b4001f4a95c57a929e..d56c185abaf95c593c4274a76d094d8fb740718f 100644 (file)
@@ -1873,9 +1873,7 @@ parse_file_info(struct archive_read *a, struct file_info *parent,
        if (iso9660->opt_support_rockridge) {
                if (parent == NULL && rr_end - rr_start >= 7) {
                        p = rr_start;
-                       if (p[0] == 'S' && p[1] == 'P'
-                           && p[2] == 7 && p[3] == 1
-                           && p[4] == 0xBE && p[5] == 0xEF) {
+                       if (memcmp(p, "SP\x07\x01\xbe\xef", 6) == 0) {
                                /*
                                 * SP extension stores the suspOffset
                                 * (Number of bytes to skip between