dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2024-11-20 04:18:26 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

webpinfo: fix fourcc comparison w/big-endian

Browse Source 
store the recognized fourccs in little-endian order to match how the
fourcc is being read from the file

Bug: webp:548
Change-Id: I9de77db92208709d5e711846908a51e563102fa5
This commit is contained in:
James Zern 2021-12-22 13:42:50 -08:00
parent a510fedb9a
commit e3cb052ca5
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
examples/webpinfo.c
View File

@ -125,16 +125,16 @@ static void WebPInfoInit(WebPInfo* const webp_info) {
memset(webp_info, 0, sizeof(*webp_info)); memset(webp_info, 0, sizeof(*webp_info));
} }
static const char kWebPChunkTags[CHUNK_TYPES][4] = { static const uint32_t kWebPChunkTags[CHUNK_TYPES] = {
{ 'V', 'P', '8', ' ' }, MKFOURCC('V', 'P', '8', ' '),
{ 'V', 'P', '8', 'L' }, MKFOURCC('V', 'P', '8', 'L'),
{ 'V', 'P', '8', 'X' }, MKFOURCC('V', 'P', '8', 'X'),
{ 'A', 'L', 'P', 'H' }, MKFOURCC('A', 'L', 'P', 'H'),
{ 'A', 'N', 'I', 'M' }, MKFOURCC('A', 'N', 'I', 'M'),
{ 'A', 'N', 'M', 'F' }, MKFOURCC('A', 'N', 'M', 'F'),
{ 'I', 'C', 'C', 'P' }, MKFOURCC('I', 'C', 'C', 'P'),
{ 'E', 'X', 'I', 'F' }, MKFOURCC('E', 'X', 'I', 'F'),
{ 'X', 'M', 'P', ' ' }, MKFOURCC('X', 'M', 'P', ' '),
}; };
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
@ -644,7 +644,7 @@ static WebPInfoStatus ParseChunk(const WebPInfo* const webp_info,
return WEBP_INFO_TRUNCATED_DATA; return WEBP_INFO_TRUNCATED_DATA;
} }
for (i = 0; i < CHUNK_TYPES; ++i) { for (i = 0; i < CHUNK_TYPES; ++i) {
if (!memcmp(kWebPChunkTags[i], &fourcc, TAG_SIZE)) break; if (kWebPChunkTags[i] == fourcc) break;
} }
chunk_data->offset_ = chunk_start_offset; chunk_data->offset_ = chunk_start_offset;
chunk_data->size_ = chunk_size; chunk_data->size_ = chunk_size;
@ -939,7 +939,13 @@ static WebPInfoStatus ProcessChunk(const ChunkData* const chunk_data,
LOG_WARN(error_message); LOG_WARN(error_message);
} else { } else {
if (!webp_info->quiet_) { if (!webp_info->quiet_) {
const char* tag = kWebPChunkTags[chunk_data->id_]; char tag[4];
uint32_t fourcc = kWebPChunkTags[chunk_data->id_];
#ifdef WORDS_BIGENDIAN
fourcc = (fourcc >> 24) | ((fourcc >> 8) & 0xff00) |
((fourcc << 8) & 0xff0000) | (fourcc << 24);
#endif
memcpy(tag, &fourcc, sizeof(tag));
printf("Chunk %c%c%c%c at offset %6d, length %6d\n", printf("Chunk %c%c%c%c at offset %6d, length %6d\n",
tag[0], tag[1], tag[2], tag[3], (int)chunk_data->offset_, tag[0], tag[1], tag[2], tag[3], (int)chunk_data->offset_,
(int)chunk_data->size_); (int)chunk_data->size_);