commit b8072d84ba9bf43701fcace61414b3cef5910919
author Dan Stoza <stoza@google.com> Wed Jan 29 14:33:57 2014 -0800
committer Dan Stoza <stoza@google.com> Wed Jan 29 15:02:14 2014 -0800
tree 19c12caa90d582a443c43117a2d979314f0dca77
parent ef11a6c887891be04c4ca9cc60bcad8d022189b3

libgui: Fix segfault in SRGB tests

Make the test exit cleanly if the output buffer is never mapped.

Bug: 12761226
Change-Id: If789f02198851a17b11ee06f612f9ba7e06da754

libs/gui/tests/SRGB_test.cpp

diff --git a/libs/gui/tests/SRGB_test.cpp b/libs/gui/tests/SRGB_test.cpp
index cdf24ff..1077c9d 100644
--- a/libs/gui/tests/SRGB_test.cpp
+++ b/libs/gui/tests/SRGB_test.cpp
@@ -82,6 +82,7 @@
 
     virtual void TearDown() {
         ASSERT_NO_FATAL_FAILURE(copyToDebugSurface());
+        ASSERT_TRUE(mLockedBuffer.data != NULL);
         ASSERT_EQ(NO_ERROR, mCpuConsumer->unlockBuffer(mLockedBuffer));
     }
 
@@ -258,6 +259,7 @@
         EXPECT_TRUE(eglChooseConfig(mEglDisplay, configAttribs, &mEglConfig, 1,
                 &numConfigs));
         ASSERT_EQ(EGL_SUCCESS, eglGetError());
+        ASSERT_GT(numConfigs, 0);
 
         static const EGLint contextAttribs[] = {
             EGL_CONTEXT_CLIENT_VERSION, 3,