summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorVladimir Marko <vmarko@google.com>2015-01-07 10:24:43 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-07 10:24:43 +0000
commitbf31cb6be4290ce161d99a2a70c318f665a14a77 (patch)
tree5556e340fe2929a2258050495409fee6dc02e548 /core
parent21735e222e0009b1ddcb080faa5b51117d0da879 (diff)
parent8371f2e3fac04663dae2e5fb98dbce7e32325991 (diff)
downloadframeworks_base-bf31cb6be4290ce161d99a2a70c318f665a14a77.zip
frameworks_base-bf31cb6be4290ce161d99a2a70c318f665a14a77.tar.gz
frameworks_base-bf31cb6be4290ce161d99a2a70c318f665a14a77.tar.bz2
am 8371f2e3: Merge "Check for OOM in BitmapFactory\'s getMimeTypeString()."
* commit '8371f2e3fac04663dae2e5fb98dbce7e32325991': Check for OOM in BitmapFactory's getMimeTypeString().
Diffstat (limited to 'core')
-rw-r--r--core/jni/android/graphics/BitmapFactory.cpp15
1 files changed, 10 insertions, 5 deletions
diff --git a/core/jni/android/graphics/BitmapFactory.cpp b/core/jni/android/graphics/BitmapFactory.cpp
index 0a95b44..592559a 100644
--- a/core/jni/android/graphics/BitmapFactory.cpp
+++ b/core/jni/android/graphics/BitmapFactory.cpp
@@ -63,7 +63,7 @@ jstring getMimeTypeString(JNIEnv* env, SkImageDecoder::Format format) {
{ SkImageDecoder::kWBMP_Format, "image/vnd.wap.wbmp" }
};
- const char* cstr = NULL;
+ const char* cstr = nullptr;
for (size_t i = 0; i < SK_ARRAY_COUNT(gMimeTypes); i++) {
if (gMimeTypes[i].fFormat == format) {
cstr = gMimeTypes[i].fMimeType;
@@ -71,8 +71,10 @@ jstring getMimeTypeString(JNIEnv* env, SkImageDecoder::Format format) {
}
}
- jstring jstr = 0;
- if (NULL != cstr) {
+ jstring jstr = nullptr;
+ if (cstr != nullptr) {
+ // NOTE: Caller should env->ExceptionCheck() for OOM
+ // (can't check for nullptr as it's a valid return value)
jstr = env->NewStringUTF(cstr);
}
return jstr;
@@ -323,10 +325,13 @@ static jobject doDecode(JNIEnv* env, SkStreamRewindable* stream, jobject padding
// 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)