Commit c847a483 authored Oct 30, 2012 by wang, biao Committed by Wang LiangX Apr 09, 2014

MetadataRetriever: Check null pointer to avoid tombstone crash.



When the app's vm-heap is not enough, memory allocation for big
object like bitmap may failed.

This patch add protection for bitmap creating to avoid segment
fault error in the following GetIntField function.

Change-Id: I63977dc602f4ed395afd11004a0ed027173fb685
Signed-off-by: wang, biao <biao.wang@intel.com>
Signed-off-by: TingX Li <tingx.li@intel.com>
Signed-off-by: Wang LiangX <liangx.wang@intel.com>

parent b3cafa56

media/jni/android_media_MediaMetadataRetriever.cpp

+7 −0

Original line number	Diff line number	Diff line
		@@ -262,6 +262,13 @@ static jobject android_media_MediaMetadataRetriever_getFrameAtTime(JNIEnv *env,
		width,
		height,
		config);
		if (jBitmap == NULL) {
		if (env->ExceptionCheck()) {
		env->ExceptionClear();
		}
		ALOGE("getFrameAtTime: create Bitmap failed!");
		return NULL;
		}

		SkBitmap *bitmap =
		(SkBitmap *) env->GetLongField(jBitmap, fields.nativeBitmap);