From b8072d84ba9bf43701fcace61414b3cef5910919 Mon Sep 17 00:00:00 2001
From: Dan Stoza <stoza@google.com>
Date: Wed, 29 Jan 2014 14:33:57 -0800
Subject: [PATCH] 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 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libs/gui/tests/SRGB_test.cpp b/libs/gui/tests/SRGB_test.cpp
index cdf24ff44..1077c9d8e 100644
--- a/libs/gui/tests/SRGB_test.cpp
+++ b/libs/gui/tests/SRGB_test.cpp
@@ -82,6 +82,7 @@ protected:
 
     virtual void TearDown() {
         ASSERT_NO_FATAL_FAILURE(copyToDebugSurface());
+        ASSERT_TRUE(mLockedBuffer.data != NULL);
         ASSERT_EQ(NO_ERROR, mCpuConsumer->unlockBuffer(mLockedBuffer));
     }
 
@@ -258,6 +259,7 @@ private:
         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,