LineageOS/android_external_libvpx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check size limit in vpx_realloc_frame_buffer.

Browse Source 
If CONFIG_SIZE_LIMIT is defined, vpx_realloc_frame_buffer should fail if
width or height is too big.

This carries over commit ebc2714d71a834fc32a19eef0a81f51fbc47db01 of
libaom: https://aomedia-review.googlesource.com/c/aom/+/65521

Change-Id: Id7645c5cefbe1847714695d41f506ff30ea985f6
This commit is contained in:
Wan-Teh Chang
2018-07-24 12:14:54 -07:00
parent c934d9d65c
commit 94a65e8fba
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vpx_scale/generic/yv12config.c
View File

@@ -143,6 +143,10 @@ int vpx_realloc_frame_buffer(YV12_BUFFER_CONFIG *ybf, int width, int height,
vpx_codec_frame_buffer_t *fb, vpx_codec_frame_buffer_t *fb,
vpx_get_frame_buffer_cb_fn_t cb, void *cb_priv) { vpx_get_frame_buffer_cb_fn_t cb, void *cb_priv) {
if (ybf) { if (ybf) {
#if CONFIG_SIZE_LIMIT
if (width > DECODE_WIDTH_LIMIT || height > DECODE_HEIGHT_LIMIT) return -1;
#endif
const int vp9_byte_align = (byte_alignment == 0) ? 1 : byte_alignment; const int vp9_byte_align = (byte_alignment == 0) ? 1 : byte_alignment;
const int aligned_width = (width + 7) & ~7; const int aligned_width = (width + 7) & ~7;
const int aligned_height = (height + 7) & ~7; const int aligned_height = (height + 7) & ~7;