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

Merge "Check for OOM in BitmapFactory's getMimeTypeString()." into lmp-mr1-dev

Browse Source
This commit is contained in:
Vladimir Marko
2015-01-08 10:24:48 +00:00
committed by Android (Google) Code Review
parent c010c96fdf 152d7282a4
commit e9a935f6b6
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/jni/android/graphics/BitmapFactory.cpp
View File

@@ -77,8 +77,10 @@ jstring getMimeTypeString(JNIEnv* env, SkImageDecoder::Format format) {
} }
} }
jstring jstr = 0; jstring jstr = NULL;
if (NULL != cstr) { if (cstr != NULL) {
// NOTE: Caller should env->ExceptionCheck() for OOM
// (can't check for NULL as it's a valid return value)
jstr = env->NewStringUTF(cstr); jstr = env->NewStringUTF(cstr);
} }
return jstr; return jstr;
@@ -330,10 +332,13 @@ static jobject doDecode(JNIEnv* env, SkStreamRewindable* stream, jobject padding
// update options (if any) // update options (if any)
if (options != NULL) { if (options != NULL) {
jstring mimeType = getMimeTypeString(env, decoder->getFormat());
if (env->ExceptionCheck()) {
return nullObjectReturn("OOM in getMimeTypeString()");
}
env->SetIntField(options, gOptions_widthFieldID, scaledWidth); env->SetIntField(options, gOptions_widthFieldID, scaledWidth);
env->SetIntField(options, gOptions_heightFieldID, scaledHeight); env->SetIntField(options, gOptions_heightFieldID, scaledHeight);
env->SetObjectField(options, gOptions_mimeFieldID, env->SetObjectField(options, gOptions_mimeFieldID, mimeType);
getMimeTypeString(env, decoder->getFormat()));
} }
// if we're in justBounds mode, return now (skip the java bitmap) // if we're in justBounds mode, return now (skip the java bitmap)