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

Commit c04399fe authored by Lajos Molnar's avatar Lajos Molnar
Browse files

media: don't expose private keys in MediaFormat 

Bug: 25684127
Change-Id: Ie263d290037633291b791ca78ba7cf4d6b3de9c8
parent fb5f2e57

media/jni/android_media_Utils.cpp

+10 −0
Original line number Original line Diff line number Diff line
@@ -307,6 +307,11 @@ status_t ConvertMessageToMap( 
        AMessage::Type valueType;

        AMessage::Type valueType;

        const char *key = msg->getEntryNameAt(i, &valueType);

        const char *key = msg->getEntryNameAt(i, &valueType);





        if (!strncmp(key, "android._", 9)) {

            // don't expose private keys (starting with android._)

            continue;

        }



        jobject valueObj = NULL;

        jobject valueObj = NULL;





        switch (valueType) {

        switch (valueType) {
@@ -460,6 +465,11 @@ status_t ConvertKeyValueArraysToMessage( 
        env->ReleaseStringUTFChars((jstring)keyObj, tmp);

        env->ReleaseStringUTFChars((jstring)keyObj, tmp);

        tmp = NULL;

        tmp = NULL;





        if (key.startsWith("android._")) {

            // don't propagate private keys (starting with android._)

            continue;

        }



        jobject valueObj = env->GetObjectArrayElement(values, i);

        jobject valueObj = env->GetObjectArrayElement(values, i);





        if (env->IsInstanceOf(valueObj, stringClass.get())) {

        if (env->IsInstanceOf(valueObj, stringClass.get())) {