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

Commit 337aa376 authored by Marco Nelissen's avatar Marco Nelissen Committed by Gerrit Code Review
Browse files

Merge "Add NULL check in updateProxyConfig"

parents e71afc2e e795ec73

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