commit 10fd73a238a2e406dd8b62ca76990d4d0a8651ce
author Android (Google) Code Review <android-gerrit@google.com> Mon May 11 12:20:20 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Mon May 11 12:20:20 2009 -0700
tree e5c86a30d09b1e83560c5356da676adcb19738ad
parent 7a6287a077837d41d47c3fbe0f6258c78d5ccbd4
parent 7f2ae493c58e221b2961ccbd92de24565665633c

am 7f2ae49: Merge change 1370 into donut

Merge commit '7f2ae493c58e221b2961ccbd92de24565665633c'

* commit '7f2ae493c58e221b2961ccbd92de24565665633c':
  Fix a JNI layer crash due to null camera object passed to get_native_camera()

media/jni/android_media_MediaRecorder.cpp

diff --git a/media/jni/android_media_MediaRecorder.cpp b/media/jni/android_media_MediaRecorder.cpp
index 209b09f..cac65d6 100644
--- a/media/jni/android_media_MediaRecorder.cpp
+++ b/media/jni/android_media_MediaRecorder.cpp
@@ -150,6 +150,11 @@
 
 static void android_media_MediaRecorder_setCamera(JNIEnv* env, jobject thiz, jobject camera)
 {
+    // we should not pass a null camera to get_native_camera() call.
+    if (camera == NULL) {
+        jniThrowException(env, "java/lang/NullPointerException", "camera object is a NULL pointer");
+        return;
+    }
     sp<Camera> c = get_native_camera(env, camera, NULL);
     sp<MediaRecorder> mr = getMediaRecorder(env, thiz);
     process_media_recorder_call(env, mr->setCamera(c->remote()),