am 88309159: am 38134303: am 84be180e: Merge "Fix crash in getNativeCanvas when canvasHandle is NULL" into lmp-mr1-dev

* commit '88309159a53ceb4f34fe01056521e4b84e848ef7': Fix crash in getNativeCanvas when canvasHandle is NULL
2014-11-25 18:51:37 +00:00
parent 58383869ab 88309159a5
commit 2b5edf651a
1 changed files with 3 additions and 0 deletions
--- a/core/jni/android/graphics/Graphics.cpp
+++ b/core/jni/android/graphics/Graphics.cpp
@@ -361,6 +361,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;