From a9a6332be243d797912dd96ceb71bca6a8e4b40a Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Fri, 22 Oct 2021 15:51:44 +1100 Subject: [PATCH] Have etc__magic_number_guess_fourcc find ICO --- internal/cgen/base/magic-submodule.c | 19 ++++++++++++------- release/c/wuffs-unsupported-snapshot.c | 19 ++++++++++++------- test/data/README.md | 2 +- test/data/hippopotamus.regular.ico | Bin 0 -> 4318 bytes 4 files changed, 25 insertions(+), 15 deletions(-) create mode 100644 test/data/hippopotamus.regular.ico diff --git a/internal/cgen/base/magic-submodule.c b/internal/cgen/base/magic-submodule.c index 90782bc6..cac95062 100644 --- a/internal/cgen/base/magic-submodule.c +++ b/internal/cgen/base/magic-submodule.c @@ -26,7 +26,7 @@ wuffs_base__magic_number_guess_fourcc(wuffs_base__slice_u8 prefix) { int32_t fourcc; const char* magic; } table[] = { - {0x57424D50, "\x01\x00\x00"}, // WBMP + {0x30302020, "\x01\x00\x00"}, // '00 'be (see § below) {0x424D5020, "\x01\x42\x4D"}, // BMP {0x47494620, "\x03\x47\x49\x46\x38"}, // GIF {0x54494646, "\x03\x49\x49\x2A\x00"}, // TIFF (little-endian) @@ -89,15 +89,20 @@ match: return 0x5750384C; // 'WP8L'be } } - } else if (fourcc == 0x57424D50) { // 'WBMP'be + } else if (fourcc == 0x30302020) { // '00 'be + // Binary data starting with multiple 0x00 NUL bytes is quite common. if (prefix.len < 4) { return -1; - } else if ((prefix.ptr[2] == 0x00) || - ((prefix.ptr[2] < 0x80) && (prefix.ptr[3] == 0x00))) { - // Reject 0-width or 0-height WBMP images. Binary data starting with - // multiple 0x00 NUL bytes is quite common. - return 0; + } else if ((prefix.ptr[2] != 0x00) && + ((prefix.ptr[2] >= 0x80) || (prefix.ptr[3] != 0x00))) { + // Roughly speaking, this could be a non-degenerate (non-0-width and + // non-0-height) WBMP image. + return 0x57424D50; // 'WBMP'be + } else if (((prefix.ptr[2] == 0x01) || (prefix.ptr[2] == 0x02)) && + (prefix.ptr[3] == 0x00)) { + return 0x49434F20; // 'ICO 'be } + return 0; } return fourcc; } diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index fd34bf34..a59a1297 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -15411,7 +15411,7 @@ wuffs_base__magic_number_guess_fourcc(wuffs_base__slice_u8 prefix) { int32_t fourcc; const char* magic; } table[] = { - {0x57424D50, "\x01\x00\x00"}, // WBMP + {0x30302020, "\x01\x00\x00"}, // '00 'be (see § below) {0x424D5020, "\x01\x42\x4D"}, // BMP {0x47494620, "\x03\x47\x49\x46\x38"}, // GIF {0x54494646, "\x03\x49\x49\x2A\x00"}, // TIFF (little-endian) @@ -15474,15 +15474,20 @@ match: return 0x5750384C; // 'WP8L'be } } - } else if (fourcc == 0x57424D50) { // 'WBMP'be + } else if (fourcc == 0x30302020) { // '00 'be + // Binary data starting with multiple 0x00 NUL bytes is quite common. if (prefix.len < 4) { return -1; - } else if ((prefix.ptr[2] == 0x00) || - ((prefix.ptr[2] < 0x80) && (prefix.ptr[3] == 0x00))) { - // Reject 0-width or 0-height WBMP images. Binary data starting with - // multiple 0x00 NUL bytes is quite common. - return 0; + } else if ((prefix.ptr[2] != 0x00) && + ((prefix.ptr[2] >= 0x80) || (prefix.ptr[3] != 0x00))) { + // Roughly speaking, this could be a non-degenerate (non-0-width and + // non-0-height) WBMP image. + return 0x57424D50; // 'WBMP'be + } else if (((prefix.ptr[2] == 0x01) || (prefix.ptr[2] == 0x02)) && + (prefix.ptr[3] == 0x00)) { + return 0x49434F20; // 'ICO 'be } + return 0; } return fourcc; } diff --git a/test/data/README.md b/test/data/README.md index fd1bf401..d3d43491 100644 --- a/test/data/README.md +++ b/test/data/README.md @@ -6,7 +6,7 @@ files were generated by `script/extract-palette-indexes.go`. The `*.tokens` files were generated by `script/print-json-token-debug-format.c`. The `*.jpeg` files are usually the canonical versions of the test/data images, -and other versions (`*.bmp`, `*.gif`, `*.png`, `*.tiff`) were generated by +and other versions (`*.bmp`, `*.gif`, `*.png` etc) were usually generated by ImageMagick's `convert` command line tool. The `*.wbmp` versions were generated by the `script/convert-png-to-wbmp.go` command line tool. The `*.webp` versions were generated by the cwebp command line tool. The `*.no-ancillary.png` files diff --git a/test/data/hippopotamus.regular.ico b/test/data/hippopotamus.regular.ico new file mode 100644 index 0000000000000000000000000000000000000000..18b0b83e9286dccfdd3b1b73c0e55d11e4c9e6b3 GIT binary patch literal 4318 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 literal 0 HcmV?d00001