b=750272; protect against raised Java-side exception when getting EGL Surface; r=blassey

2012-05-18 08:59:01 -04:00
parent e1ba6751c1
commit 632fd8a93f
1 changed files with 3 additions and 0 deletions
--- a/widget/android/AndroidLayerViewWrapper.cpp
+++ b/widget/android/AndroidLayerViewWrapper.cpp
@@ -90,6 +90,9 @@ AndroidGLController::ProvideEGLSurface()
    ASSERT_THREAD();
    AutoLocalJNIFrame jniFrame(mJEnv);
    jobject jObj = mJEnv->CallObjectMethod(mJObj, jProvideEGLSurfaceMethod);
+    if (jniFrame.CheckForException())
+        return NULL;
+
    return reinterpret_cast<EGLSurface>(mJEnv->GetIntField(jObj, jEGLSurfacePointerField));
 }