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

Commit 13249411 authored by Marco Nelissen's avatar Marco Nelissen Committed by Android Git Automerger
Browse files

am a9045d24: am 337aa376: Merge "Add NULL check in updateProxyConfig" 

* commit 'a9045d24':
  Add NULL check in updateProxyConfig
parents 80b0496a a9045d24

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