commit 16cfa2e38bfbdafdba21af7f9f1c4d1418cbe1d3
author Jamie Gennis <jgennis@google.com> Fri Sep 21 13:43:23 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 21 13:43:24 2012 -0700
tree 9ae749672de1a5657ce7fbaad2a35d5bf0f7c814
parent e0606e29875a55dedc1a4f0a738d5eb40fe1eb41
parent d1b330de416adff0d178a5cb7271419d9ed7a89a

Merge "SurfaceTexture: fix an out of bounds array write" into jb-mr1-dev

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 0ce5266..8164d20 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -536,6 +536,10 @@
     }
 
     const HWComposer& hwc(getHwComposer());
+    if (!hwc.isConnected(type)) {
+        return NAME_NOT_FOUND;
+    }
+
     float xdpi = hwc.getDpiX(type);
     float ydpi = hwc.getDpiY(type);