Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36401a36 authored by Vladimir Marko's avatar Vladimir Marko Committed by Android Git Automerger
Browse files

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

* commit 'e9a935f6':
  Check for OOM in BitmapFactory's getMimeTypeString().
parents d1646dcf e9a935f6

core/jni/android/graphics/BitmapFactory.cpp

+9 −4
Original line number Diff line number Diff line
@@ -77,8 +77,10 @@ jstring getMimeTypeString(JNIEnv* env, SkImageDecoder::Format format) { 
        }

    }



    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 @@ 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)