Merge "mediacodec: Don't crash if trying to open a codec that does not exist"

Jean-Baptiste Queru · android code review · commit 4da3769d3085 · 2012-08-13T09:30:11.000-07:00
diff --git a/media/jni/android_media_MediaCodec.cpp b/media/jni/android_media_MediaCodec.cpp
@@ -96,7 +96,10 @@ status_t JMediaCodec::initCheck() const {
 }
 
 JMediaCodec::~JMediaCodec() {
-    mCodec->release();
+    if (mCodec != NULL) {
+        mCodec->release();
+        mCodec.clear();
+    }
 
     JNIEnv *env = AndroidRuntime::getJNIEnv();
 

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,10 @@ status_t JMediaCodec::initCheck() const {`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`JMediaCodec::~JMediaCodec() {`
`99`		`- mCodec->release();`
	`99`	`+ if (mCodec != NULL) {`
	`100`	`+ mCodec->release();`
	`101`	`+ mCodec.clear();`
	`102`	`+ }`
`100`	`103`
`101`	`104`	`JNIEnv *env = AndroidRuntime::getJNIEnv();`
`102`	`105`