From 4e0df8ede853d0038c5b8314021b8fd76232f9ea Mon Sep 17 00:00:00 2001 From: Mathias Agopian Date: Tue, 4 Aug 2009 20:53:59 -0700 Subject: [PATCH] don't crash when SurfaceBuffer::writeToParcel is given a null argument --- libs/ui/Surface.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/ui/Surface.cpp b/libs/ui/Surface.cpp index a4710aafb4959..c73909f0cd894 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);