dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2025-02-12 15:02:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rectify WebPParseOptionalChunks().

Browse Source 
Now it stops at either VP8/VP8L chunk.

Change-Id: Iadac4fa47396b61b9b720b8b7b19138c89df24cc
This commit is contained in:
Urvang Joshi 2012-05-23 13:59:02 +05:30
parent 237eab6764
commit a107dfa806
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/dec/webp.c
View File

@ -123,8 +123,8 @@ static VP8StatusCode ParseVP8X(const uint8_t** data, size_t* data_size,
return VP8_STATUS_OK; return VP8_STATUS_OK;
} }
// Skips to the next VP8 chunk header in the data given the size of the RIFF // Skips to the next VP8/VP8L chunk header in the data given the size of the
// chunk 'riff_size'. // RIFF chunk 'riff_size'.
// Returns VP8_STATUS_BITSTREAM_ERROR if any invalid chunk size is encountered, // Returns VP8_STATUS_BITSTREAM_ERROR if any invalid chunk size is encountered,
// VP8_STATUS_NOT_ENOUGH_DATA in case of insufficient data, and // VP8_STATUS_NOT_ENOUGH_DATA in case of insufficient data, and
// VP8_STATUS_OK otherwise. // VP8_STATUS_OK otherwise.
@ -177,7 +177,8 @@ static VP8StatusCode ParseOptionalChunks(const uint8_t** data,
if (!memcmp(buf, "ALPH", TAG_SIZE)) { // A valid ALPH header. if (!memcmp(buf, "ALPH", TAG_SIZE)) { // A valid ALPH header.
*alpha_data = buf + CHUNK_HEADER_SIZE; *alpha_data = buf + CHUNK_HEADER_SIZE;
*alpha_size = chunk_size; *alpha_size = chunk_size;
} else if (!memcmp(buf, "VP8 ", TAG_SIZE)) { // A valid VP8 header. } else if (!memcmp(buf, "VP8 ", TAG_SIZE) ||
!memcmp(buf, "VP8L", TAG_SIZE)) { // A valid VP8/VP8L header.
return VP8_STATUS_OK; // Found. return VP8_STATUS_OK; // Found.
} }
@ -218,7 +219,7 @@ static VP8StatusCode ParseVP8Header(const uint8_t** data, size_t* data_size,
if ((riff_size >= minimal_size) && (size > riff_size - minimal_size)) { if ((riff_size >= minimal_size) && (size > riff_size - minimal_size)) {
return VP8_STATUS_BITSTREAM_ERROR; // Inconsistent size information. return VP8_STATUS_BITSTREAM_ERROR; // Inconsistent size information.
} }
// Skip over CHUNK_HEADER_SIZE bytes from VP8 Header. // Skip over CHUNK_HEADER_SIZE bytes from VP8/VP8L Header.
*chunk_size = size; *chunk_size = size;
*data += CHUNK_HEADER_SIZE; *data += CHUNK_HEADER_SIZE;
*data_size -= CHUNK_HEADER_SIZE; *data_size -= CHUNK_HEADER_SIZE;
@ -270,11 +271,11 @@ VP8StatusCode WebPParseHeaders(WebPHeaderStructure* const headers) {
} }
} }
// Skip over VP8 chunk header. // Skip over VP8/VP8L chunk header.
status = ParseVP8Header(&buf, &buf_size, headers->riff_size, status = ParseVP8Header(&buf, &buf_size, headers->riff_size,
&headers->compressed_size, &headers->is_lossless); &headers->compressed_size, &headers->is_lossless);
if (status != VP8_STATUS_OK) { if (status != VP8_STATUS_OK) {
return status; // Invalid VP8 header / insufficient data. return status; // Invalid VP8/VP8L header / insufficient data.
} }
headers->offset = (uint32_t)(buf - headers->data); headers->offset = (uint32_t)(buf - headers->data);
@ -557,11 +558,11 @@ static VP8StatusCode GetFeatures(const uint8_t* data, size_t data_size,
} }
} }
// Skip over VP8 header. // Skip over VP8/VP8L header.
status = ParseVP8Header(&data, &data_size, riff_size, status = ParseVP8Header(&data, &data_size, riff_size,
&chunk_size, &is_lossless); &chunk_size, &is_lossless);
if (status != VP8_STATUS_OK) { if (status != VP8_STATUS_OK) {
return status; // Wrong VP8 chunk-header / insufficient data. return status; // Wrong VP8/VP8L chunk-header / insufficient data.
} }
if (!is_lossless) { if (!is_lossless) {