Merge "Added checking for invalid size"

This commit is contained in:
Yaowu Xu 2013-10-18 11:45:12 -07:00 committed by Gerrit Code Review
commit ce34b6f50d

View File

@ -802,6 +802,7 @@ static size_t read_uncompressed_header(VP9D_COMP *pbi,
struct vp9_read_bit_buffer *rb) {
VP9_COMMON *const cm = &pbi->common;
MACROBLOCKD *const xd = &pbi->mb;
size_t sz;
int i;
cm->last_frame_type = cm->frame_type;
@ -909,8 +910,9 @@ static size_t read_uncompressed_header(VP9D_COMP *pbi,
setup_segmentation(&cm->seg, rb);
setup_tile_info(cm, rb);
sz = vp9_rb_read_literal(rb, 16);
return vp9_rb_read_literal(rb, 16);
return sz > 0 ? sz : -1;
}
static int read_compressed_header(VP9D_COMP *pbi, const uint8_t *data,