ref: ee3df31d74f0dad0bdcfe9443c1484f551997e82
parent: d51d3934f590573e5be5178b17463d2cbc2ddc37
parent: 2930903d51ab4a10c162f8703154442ce0127adb
author: James Zern <jzern@google.com>
date: Mon May 1 15:22:21 EDT 2017
Merge "vpx_scale_test: fix segfault on alloc failure"
--- a/test/vpx_scale_test.cc
+++ b/test/vpx_scale_test.cc
@@ -178,7 +178,7 @@
static const int kSizesToTest[] = { 1, 15, 33, 145, 512, 1025, 16383 };
for (int h = 0; h < kNumSizesToTest; ++h) {
for (int w = 0; w < kNumSizesToTest; ++w) {
- ResetImage(kSizesToTest[w], kSizesToTest[h]);
+ ASSERT_NO_FATAL_FAILURE(ResetImage(kSizesToTest[w], kSizesToTest[h]));
ExtendBorder();
ReferenceExtendBorder();
CompareImages(img_);
@@ -217,7 +217,7 @@
static const int kSizesToTest[] = { 1, 15, 33, 145, 512, 1025, 16383 };
for (int h = 0; h < kNumSizesToTest; ++h) {
for (int w = 0; w < kNumSizesToTest; ++w) {
- ResetImage(kSizesToTest[w], kSizesToTest[h]);
+ ASSERT_NO_FATAL_FAILURE(ResetImage(kSizesToTest[w], kSizesToTest[h]));
ReferenceCopyFrame();
CopyFrame();
CompareImages(cpy_img_);