From 1fa4cef34a8ac07e2ef15f2fef3dcfe520848c8d Mon Sep 17 00:00:00 2001
From: Digish Pandya <digishp@codeaurora.org>
Date: Thu, 12 Jun 2014 10:42:54 +0530
Subject: hwui: fix possible null pointer de-refrence

add layer check for  null before de-refrencing it.

issue link: http://code.google.com/p/android/issues/detail?id=61622

Change-Id: I54fc21ec594effcfb1eededd80dd5b0b52645c4c
---
 libs/hwui/LayerRenderer.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'libs/hwui/LayerRenderer.cpp')

diff --git a/libs/hwui/LayerRenderer.cpp b/libs/hwui/LayerRenderer.cpp
index f8076cc414d0..006d145a14c5 100644
--- a/libs/hwui/LayerRenderer.cpp
+++ b/libs/hwui/LayerRenderer.cpp
@@ -339,8 +339,10 @@ void LayerRenderer::destroyLayerDeferred(Layer* layer) {
 
 void LayerRenderer::flushLayer(Layer* layer) {
 #ifdef GL_EXT_discard_framebuffer
+    if (!layer) return;
+
     GLuint fbo = layer->getFbo();
-    if (layer && fbo) {
+    if (fbo) {
         // If possible, discard any enqueud operations on deferred
         // rendering architectures
         if (Extensions::getInstance().hasDiscardFramebuffer()) {
-- 
cgit v1.2.3-59-g8ed1b