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

Commit e795ec73 authored by Oscar Rydhé's avatar Oscar Rydhé Committed by Takeshi Aimi
Browse files

Add NULL check in updateProxyConfig 

If the exclusionList was null in updateProxyConfig the VM would
crash when converting it to a UTF8 string. Avoid this by adding a
null check.

Change-Id: I0d8106fd54385bd9ae9c652a6c67d459a119cf2b
parent 7f8c70a1

media/jni/android_media_MediaPlayer.cpp

+11 −8
Original line number Diff line number Diff line
@@ -826,16 +826,19 @@ android_media_MediaPlayer_updateProxyConfig( 
        jstring exclusionListObj = (jstring)env->CallObjectMethod(

                proxyProps, fields.proxyConfigGetExclusionList);



        const char *exclusionList =

            env->GetStringUTFChars(exclusionListObj, NULL);



        if (host != NULL && exclusionListObj != NULL) {

            thisplayer->updateProxyConfig(host, port, exclusionList);

        }

            const char *exclusionList = env->GetStringUTFChars(exclusionListObj, NULL);



            if (exclusionList != NULL) {

                thisplayer->updateProxyConfig(host, port, exclusionList);



                env->ReleaseStringUTFChars(exclusionListObj, exclusionList);

                exclusionList = NULL;

            } else {

                thisplayer->updateProxyConfig(host, port, "");

            }

        } else if (host != NULL) {

            thisplayer->updateProxyConfig(host, port, "");

        }



        if (host != NULL) {