OSDN Git Service

hwui: fix possible null pointer de-refrence
authorDigish Pandya <digishp@codeaurora.org>
Thu, 12 Jun 2014 05:12:54 +0000 (10:42 +0530)
committerDigish Pandya <digishp@codeaurora.org>
Fri, 13 Jun 2014 11:44:50 +0000 (17:14 +0530)
add layer check for  null before de-refrencing it.

link: http://code.google.com/p/android/issues/detail?id=61622
Change-Id: I54fc21ec594effcfb1eededd80dd5b0b52645c4c

libs/hwui/LayerRenderer.cpp

index f8076cc..006d145 100644 (file)
@@ -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()) {