Avoid SIGSEGV in Bitmap_writeToParcel.

SkBitmap::getPixels() can return NULL. The rest of the JNI Bitmap
code treats this NULL as if the SkBitmap has transparent black
pixels. Bitmap_writeToParcel now does the same.

Change-Id: I5e70b42b3d22a8aea898ce342e590000325bd0f9

1 files changed, 9 insertions, 1 deletions

diff --git a/core/jni/android/graphics/Bitmap.cpp b/core/jni/android/graphics/Bitmap.cpp
index 8956e39..29c6ba2 100644
--- a/core/jni/android/graphics/Bitmap.cpp
+++ b/core/jni/android/graphics/Bitmap.cpp
@@ -429,7 +429,15 @@ static jboolean Bitmap_writeToParcel(JNIEnv* env, jobject,
 

     size_t size = bitmap->getSize();

     bitmap->lockPixels();

-    memcpy(p->writeInplace(size), bitmap->getPixels(), size);

+    void* pDst = p->writeInplace(size);

+

+    const void* pSrc =  bitmap->getPixels();

+

+    if (pSrc == NULL) {

+        memset(pDst, 0, size);

+    } else {

+        memcpy(pDst, pSrc, size);

+    }

     bitmap->unlockPixels();

     return true;

 }