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

Merge "media: release allocated strings on error" into lmp-dev

Browse Source
This commit is contained in:
Lajos Molnar
2014-08-14 07:37:32 +00:00
committed by Android (Google) Code Review
parent 621085e50f 018b70f5de
commit eed01e068b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
media/jni/android_media_MediaCodecList.cpp
View File

@@ -85,6 +85,7 @@ static jint android_media_MediaCodecList_findCodecByName(
sp<IMediaCodecList> mcl = getCodecList(env);
if (mcl == NULL) {
// Runtime exception already pending.
env->ReleaseStringUTFChars(name, nameStr);
return -ENOENT;
}
@@ -162,7 +163,6 @@ static jobject android_media_MediaCodecList_getCodecCapabilities(
}
const char *typeStr = env->GetStringUTFChars(type, NULL);
if (typeStr == NULL) {
// Out of memory exception already pending.
return NULL;
@@ -177,12 +177,12 @@ static jobject android_media_MediaCodecList_getCodecCapabilities(
// TODO query default-format also from codec/codec list
const sp<MediaCodecInfo::Capabilities> &capabilities =
info->getCapabilitiesFor(typeStr);
env->ReleaseStringUTFChars(type, typeStr);
typeStr = NULL;
if (capabilities == NULL) {
jniThrowException(env, "java/lang/IllegalArgumentException", NULL);
return NULL;
}
env->ReleaseStringUTFChars(type, typeStr);
typeStr = NULL;
capabilities->getSupportedColorFormats(&colorFormats);
capabilities->getSupportedProfileLevels(&profileLevels);