commit 46078d997861dd18798d6cc91b3ca32820faf7c6
author Android (Google) Code Review <android-gerrit@google.com> Wed Aug 05 12:52:51 2009 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 05 12:52:51 2009 -0700
tree dbb9a6f1d7614def491824f7b570d6c9da3a59ad
parent d285c41e5d894af55d7e60fb1dfedd6076d68e42
parent 3eded949243c8d331190d3803b5c5c2bf2a058fc

Merge change 20133

* changes:
  don't crash when SurfaceBuffer::writeToParcel is given a null argument

libs/ui/Surface.cpp

diff --git a/libs/ui/Surface.cpp b/libs/ui/Surface.cpp
index a4710aa..c73909f 100644
--- a/libs/ui/Surface.cpp
+++ b/libs/ui/Surface.cpp
@@ -108,6 +108,9 @@
 status_t SurfaceBuffer::writeToParcel(Parcel* reply, 
         android_native_buffer_t const* buffer)
 {
+    if (buffer == NULL) {
+        return BAD_VALUE;
+    }
     reply->writeInt32(buffer->width);
     reply->writeInt32(buffer->height);
     reply->writeInt32(buffer->stride);