commit 0da41a3635180398ae6cbf1ff75575f5dcb6e40b
author Mathias Agopian <mathias@google.com> Tue Oct 06 15:58:44 2009 -0700
committer Mathias Agopian <mathias@google.com> Wed Oct 07 18:03:35 2009 -0700
tree b8b806bfc7a287e95ab1d99e60c389d704f89720
parent a2de8e31c2693d009db1f9386406758874dd1d40

fix [2170283] SurfaceFlinger crashes on OOM.

when running out of memory, a null handle is returned but the error code may not be set.
In that case we need to return NO_MEMORY instead of NO_ERROR, so that the calling code
won't try to dereference the null pointer.

libs/ui/Surface.cpp

diff --git a/libs/ui/Surface.cpp b/libs/ui/Surface.cpp
index 2d83a8c..f51ca7a 100644
--- a/libs/ui/Surface.cpp
+++ b/libs/ui/Surface.cpp
@@ -746,6 +746,8 @@
                 currentBuffer->setIndex(index);
                 mNeedFullUpdate = true;
             }
+        } else {
+            err = err<0 ? err : NO_MEMORY;
         }
     }
     return err;