commit 4030d85f86c2fd0b2c7027096f656e299f0ee87f
author Android (Google) Code Review <android-gerrit@google.com> Fri Jul 10 09:47:37 2009 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 10 09:47:37 2009 -0700
tree df97d1dbb309485d0c9bfa1360b80b7bcef9b8c5
parent 6e2d6483fe14362187c78c91dc03024fbb31d431
parent 7278a129fc7028241e579dff199e76c683e615c7

Merge change 6734 into donut

* changes:
  Adding tagging to utterances to track which app said what.

libs/surfaceflinger/SurfaceFlinger.cpp

diff --git a/libs/surfaceflinger/SurfaceFlinger.cpp b/libs/surfaceflinger/SurfaceFlinger.cpp
index ef4a8ea..fb25663 100644
--- a/libs/surfaceflinger/SurfaceFlinger.cpp
+++ b/libs/surfaceflinger/SurfaceFlinger.cpp
@@ -1236,6 +1236,13 @@
 {
     LayerBaseClient* layer = 0;
     sp<LayerBaseClient::Surface> surfaceHandle;
+
+    if (int32_t(w|h) < 0) {
+        LOGE("createSurface() failed, w or h is negative (w=%d, h=%d)",
+                int(w), int(h));
+        return surfaceHandle;
+    }
+    
     Mutex::Autolock _l(mStateLock);
     Client* const c = mClientsMap.valueFor(clientId);
     if (UNLIKELY(!c)) {