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

check return pointer from MuxImageGetListFromId

Browse Source 
previously, it could crash with nth=1 on a raw vp8 bitstream, e.g.

Change-Id: Ice555d95b984ba71017fc56314d0c2c1b5bdf599
This commit is contained in:
Pascal Massimino 2012-04-23 08:20:22 -07:00
parent b0d6c4a722
commit 15ebcbaaf4
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mux/muxinternal.c
View File

@ -248,11 +248,8 @@ int MuxImageCount(WebPMuxImage* const wpi_list, TAG_ID id) {
int count = 0;
WebPMuxImage* current;
for (current = wpi_list; current != NULL; current = current->next_) {
WebPChunk** const wpi_chunk_ptr = MuxImageGetListFromId(current, id);
assert(wpi_chunk_ptr != NULL);
if (*wpi_chunk_ptr != NULL &&
(*wpi_chunk_ptr)->tag_ == kChunks[id].chunkTag) {
const WebPChunk* const wpi_chunk = *MuxImageGetListFromId(current, id);
if (wpi_chunk != NULL && wpi_chunk->tag_ == kChunks[id].chunkTag) {
++count;
}
}
@ -300,9 +297,8 @@ static int SearchImageToGetOrDelete(WebPMuxImage** wpi_list, uint32_t nth,
while (*wpi_list) {
WebPMuxImage* const cur_wpi = *wpi_list;
WebPChunk** const wpi_chunk_ptr = MuxImageGetListFromId(cur_wpi, id);
assert(wpi_chunk_ptr != NULL);
if ((*wpi_chunk_ptr)->tag_ == kChunks[id].chunkTag) {
const WebPChunk* const wpi_chunk = *MuxImageGetListFromId(cur_wpi, id);
if (wpi_chunk != NULL && wpi_chunk->tag_ == kChunks[id].chunkTag) {
++count;
if (count == nth) return 1; // Found.
}