Merge "vp9_dx_iface: subtract ptrs to validate frame_size"

This commit is contained in:
James Zern 2014-05-10 11:05:31 -07:00 committed by Gerrit Code Review
commit e975791564

View File

@ -413,7 +413,8 @@ static vpx_codec_err_t decoder_decode(vpx_codec_alg_priv_t *ctx,
for (i = 0; i < frame_count; ++i) {
const uint32_t frame_size = frame_sizes[i];
if (data_start < data || data_start + frame_size >= data_end) {
if (data_start < data ||
frame_size > (uint32_t)(data_end - data_start)) {
ctx->base.err_detail = "Invalid frame size in index";
return VPX_CODEC_CORRUPT_FRAME;
}