summaryrefslogtreecommitdiff
path: root/libs/hwui/LayerRenderer.cpp
diff options
context:
space:
mode:
author Digish Pandya <digishp@codeaurora.org> 2014-06-12 10:42:54 +0530
committer Digish Pandya <digishp@codeaurora.org> 2014-06-13 17:14:50 +0530
commit1fa4cef34a8ac07e2ef15f2fef3dcfe520848c8d (patch)
treea04c06f56688c59682bc753a012ca73d30bbb448 /libs/hwui/LayerRenderer.cpp
parent1a3908e95926acd8add3858be571fe23fa9d047a (diff)
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
Diffstat (limited to 'libs/hwui/LayerRenderer.cpp')
-rw-r--r--libs/hwui/LayerRenderer.cpp4
1 files changed, 3 insertions, 1 deletions
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()) {