summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2009-08-04 20:53:59 -0700
committerMathias Agopian <mathias@google.com>2009-08-05 12:22:30 -0700
commit4e0df8ede853d0038c5b8314021b8fd76232f9ea (patch)
treea395b89802178c19bb171eea222e220fe62514e8 /libs
parent429c521b15112fdcc70dca602b432fae45ca3a22 (diff)
downloadframeworks_base-4e0df8ede853d0038c5b8314021b8fd76232f9ea.zip
frameworks_base-4e0df8ede853d0038c5b8314021b8fd76232f9ea.tar.gz
frameworks_base-4e0df8ede853d0038c5b8314021b8fd76232f9ea.tar.bz2
don't crash when SurfaceBuffer::writeToParcel is given a null argument
Diffstat (limited to 'libs')
-rw-r--r--libs/ui/Surface.cpp3
1 files changed, 3 insertions, 0 deletions
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::unlock()
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);