Merge "Check for OOM in BitmapFactory's getMimeTypeString()." into lmp-mr1-dev
diff --git a/core/jni/android/graphics/BitmapFactory.cpp b/core/jni/android/graphics/BitmapFactory.cpp
index a578b5d..49577cf 100644
--- a/core/jni/android/graphics/BitmapFactory.cpp
+++ b/core/jni/android/graphics/BitmapFactory.cpp
@@ -77,8 +77,10 @@
}
}
- jstring jstr = 0;
- if (NULL != cstr) {
+ jstring jstr = NULL;
+ 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);
}
return jstr;
@@ -330,10 +332,13 @@
// update options (if any)
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_heightFieldID, scaledHeight);
- env->SetObjectField(options, gOptions_mimeFieldID,
- getMimeTypeString(env, decoder->getFormat()));
+ env->SetObjectField(options, gOptions_mimeFieldID, mimeType);
}
// if we're in justBounds mode, return now (skip the java bitmap)