Fix crash in getNativeCanvas when canvasHandle is NULL

BUG: 18261928 Change-Id: I01a5af201fe829d5752433e1bb0db7edc01733d4
2014-11-24 10:53:52 -08:00
parent b5686d5596
commit de92f4c72b
1 changed files with 3 additions and 0 deletions
--- a/core/jni/android/graphics/Graphics.cpp
+++ b/core/jni/android/graphics/Graphics.cpp
@@ -365,6 +365,9 @@ SkCanvas* GraphicsJNI::getNativeCanvas(JNIEnv* env, jobject canvas) {
    SkASSERT(canvas);
    SkASSERT(env->IsInstanceOf(canvas, gCanvas_class));
    jlong canvasHandle = env->GetLongField(canvas, gCanvas_nativeInstanceID);
+    if (!canvasHandle) {
+        return NULL;
+    }
    SkCanvas* c = reinterpret_cast<android::Canvas*>(canvasHandle)->getSkCanvas();
    SkASSERT(c);
    return c;