aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeon Scroggins <scroggo@google.com>2014-07-11 13:35:49 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-07-10 21:21:20 +0000
commitb3498921b6a4acd892f5d99cf2a83c149ef5c4df (patch)
tree437d6ee4e76f98468eaa2680b06f3b1e58cf492e
parent38fb2fd3e9241bb78ab365d804ff3ee2a9ba1377 (diff)
parentb46762490adc32ecf6a69b009854a7dcf4d950fe (diff)
downloadskia-b3498921b6a4acd892f5d99cf2a83c149ef5c4df.tar.gz
Merge "return early instead of crashing if fileData fails"
-rw-r--r--tests/KtxTest.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/KtxTest.cpp b/tests/KtxTest.cpp
index e9c4217ead..29bbd8e867 100644
--- a/tests/KtxTest.cpp
+++ b/tests/KtxTest.cpp
@@ -148,6 +148,9 @@ DEF_TEST(KtxReexportPKM, reporter) {
SkBitmap etcBitmap;
SkAutoTUnref<SkData> fileData(SkData::NewFromFileName(filename.c_str()));
REPORTER_ASSERT(reporter, NULL != fileData);
+ if (NULL == fileData) {
+ return;
+ }
bool installDiscardablePixelRefSuccess =
SkInstallDiscardablePixelRef(