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

vp9_resize: add missing alloc checks

Browse Source 
Change-Id: I87ef6dec7cd2e8f9a40135e5ca11b13520ebd6d7
This commit is contained in:
James Zern 2016-02-17 12:41:08 -08:00
parent 1710f6507d
commit efbab73cc1
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vp9/encoder/vp9_resize.c
View File

@ -462,6 +462,7 @@ static void resize_multistep(const uint8_t *const input,
int filteredlength = length; int filteredlength = length;
if (!tmpbuf) { if (!tmpbuf) {
tmpbuf = (uint8_t *)malloc(sizeof(uint8_t) * length); tmpbuf = (uint8_t *)malloc(sizeof(uint8_t) * length);
if (tmpbuf == NULL) return;
otmp = tmpbuf; otmp = tmpbuf;
} else { } else {
otmp = buf; otmp = buf;
@ -521,6 +522,7 @@ void vp9_resize_plane(const uint8_t *const input,
uint8_t *tmpbuf = (uint8_t *)malloc(sizeof(uint8_t) * uint8_t *tmpbuf = (uint8_t *)malloc(sizeof(uint8_t) *
(width < height ? height : width)); (width < height ? height : width));
uint8_t *arrbuf = (uint8_t *)malloc(sizeof(uint8_t) * (height + height2)); uint8_t *arrbuf = (uint8_t *)malloc(sizeof(uint8_t) * (height + height2));
if (intbuf == NULL || tmpbuf == NULL || arrbuf == NULL) goto Error;
assert(width > 0); assert(width > 0);
assert(height > 0); assert(height > 0);
assert(width2 > 0); assert(width2 > 0);
@ -533,6 +535,8 @@ void vp9_resize_plane(const uint8_t *const input,
resize_multistep(arrbuf, height, arrbuf + height, height2, tmpbuf); resize_multistep(arrbuf, height, arrbuf + height, height2, tmpbuf);
fill_arr_to_col(output + i, out_stride, height2, arrbuf + height); fill_arr_to_col(output + i, out_stride, height2, arrbuf + height);
} }
Error:
free(intbuf); free(intbuf);
free(tmpbuf); free(tmpbuf);
free(arrbuf); free(arrbuf);
@ -755,6 +759,7 @@ static void highbd_resize_multistep(const uint16_t *const input,
int filteredlength = length; int filteredlength = length;
if (!tmpbuf) { if (!tmpbuf) {
tmpbuf = (uint16_t *)malloc(sizeof(uint16_t) * length); tmpbuf = (uint16_t *)malloc(sizeof(uint16_t) * length);
if (tmpbuf == NULL) return;
otmp = tmpbuf; otmp = tmpbuf;
} else { } else {
otmp = buf; otmp = buf;
@ -817,6 +822,7 @@ void vp9_highbd_resize_plane(const uint8_t *const input,
uint16_t *tmpbuf = (uint16_t *)malloc(sizeof(uint16_t) * uint16_t *tmpbuf = (uint16_t *)malloc(sizeof(uint16_t) *
(width < height ? height : width)); (width < height ? height : width));
uint16_t *arrbuf = (uint16_t *)malloc(sizeof(uint16_t) * (height + height2)); uint16_t *arrbuf = (uint16_t *)malloc(sizeof(uint16_t) * (height + height2));
if (intbuf == NULL || tmpbuf == NULL || arrbuf == NULL) goto Error;
for (i = 0; i < height; ++i) { for (i = 0; i < height; ++i) {
highbd_resize_multistep(CONVERT_TO_SHORTPTR(input + in_stride * i), width, highbd_resize_multistep(CONVERT_TO_SHORTPTR(input + in_stride * i), width,
intbuf + width2 * i, width2, tmpbuf, bd); intbuf + width2 * i, width2, tmpbuf, bd);
@ -828,6 +834,8 @@ void vp9_highbd_resize_plane(const uint8_t *const input,
highbd_fill_arr_to_col(CONVERT_TO_SHORTPTR(output + i), out_stride, height2, highbd_fill_arr_to_col(CONVERT_TO_SHORTPTR(output + i), out_stride, height2,
arrbuf + height); arrbuf + height);
} }
Error:
free(intbuf); free(intbuf);
free(tmpbuf); free(tmpbuf);
free(arrbuf); free(arrbuf);