generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

webm_read_frame: avoid NULL dereference

Browse Source 
block may be NULL with block_entry_eos or from return of GetBlock()

Change-Id: Ia0dd3ffa46305ee70efcdc55c05c2ad24efc993b
This commit is contained in:
James Zern 2017-04-22 13:11:16 -07:00
parent 92ec0674fd
commit 0be513e8e8
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
webmdec.cc
View File

@ -165,10 +165,11 @@ int webm_read_frame(struct WebmInputContext *webm_ctx, uint8_t **buffer,
}
if (get_new_block) {
block = block_entry->GetBlock();
if (block == NULL) return -1;
webm_ctx->block_frame_index = 0;
}
} while (block->GetTrackNumber() != webm_ctx->video_track_index ||
block_entry_eos);
} while (block_entry_eos ||
block->GetTrackNumber() != webm_ctx->video_track_index);
webm_ctx->cluster = cluster;
webm_ctx->block_entry = block_entry;