am 678886fd: am b1fc06a4: am 5e7ef948: Merge "hwui: fix possible null pointer de-refrence"

* commit '678886fde5cd779de79f8e38479aa6de82f8e755': hwui: fix possible null pointer de-refrence
2014-06-17 01:31:16 +00:00
parent 658639c6bc 678886fde5
commit 11a8d4f8b9
1 changed files with 3 additions and 1 deletions
--- a/libs/hwui/LayerRenderer.cpp
+++ b/libs/hwui/LayerRenderer.cpp
@@ -334,8 +334,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()) {