Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 1370 into donut

Browse Source 
* changes:
  Fix a JNI layer crash due to null camera object passed to get_native_camera() The fix will check on the camera object and if it is a null object, we throw a NullPointerException; application layer should also avoid passing a null java object to MediaRecorder.setCamera().
This commit is contained in:
Android (Google) Code Review
2009-05-11 12:18:55 -07:00
parent 3b30d80f5e 429a3b5f1d
commit 7f2ae493c5
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
media/jni/android_media_MediaRecorder.cpp
View File

@@ -150,6 +150,11 @@ static sp<MediaRecorder> setMediaRecorder(JNIEnv* env, jobject thiz, const sp<Me
static void android_media_MediaRecorder_setCamera(JNIEnv* env, jobject thiz, jobject camera) 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<Camera> c = get_native_camera(env, camera, NULL);
sp<MediaRecorder> mr = getMediaRecorder(env, thiz); sp<MediaRecorder> mr = getMediaRecorder(env, thiz);
process_media_recorder_call(env, mr->setCamera(c->remote()), process_media_recorder_call(env, mr->setCamera(c->remote()),