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

Commit 9751d643 authored by eunyoung.moon's avatar eunyoung.moon Committed by Dongwon Kang
Browse files

Modified that logs do not include URLs. 



When try to play streaming, URLs are logged. URLs can be contained sensitive information.
So, modified that logs do not inlcude URLs.

Bug: 123669012
Test: play HLS/RTSP streaming
Change-Id: I379e66b7be7588b09bbf6328c964666eb546ccf2
Signed-off-by: default avatarEunyoung Moon <eunyoung.moon@lge.com>
parent d0488712

media/libstagefright/httplive/LiveSession.cpp

+4 −4
Original line number Original line Diff line number Diff line
@@ -1234,7 +1234,7 @@ bool LiveSession::resumeFetcher( 
        const AString &uri, uint32_t streamMask, int64_t timeUs, bool newUri) {

        const AString &uri, uint32_t streamMask, int64_t timeUs, bool newUri) {

    ssize_t index = mFetcherInfos.indexOfKey(uri);

    ssize_t index = mFetcherInfos.indexOfKey(uri);

    if (index < 0) {

    if (index < 0) {

        ALOGE("did not find fetcher for uri: %s", uri.c_str());

        ALOGE("did not find fetcher for uri: %s", uriDebugString(uri).c_str());

        return false;

        return false;

    }

    }
@@ -2005,7 +2005,7 @@ void LiveSession::tryToFinishBandwidthSwitch(const AString &oldUri) { 




            if ((mNewStreamMask & stream) && mStreams[idx].mNewUri.empty()) {

            if ((mNewStreamMask & stream) && mStreams[idx].mNewUri.empty()) {

                ALOGW("swapping stream type %d %s to empty stream",

                ALOGW("swapping stream type %d %s to empty stream",

                        stream, mStreams[idx].mUri.c_str());

                        stream, uriDebugString(mStreams[idx].mUri).c_str());

            }

            }

            mStreams[idx].mUri = mStreams[idx].mNewUri;

            mStreams[idx].mUri = mStreams[idx].mNewUri;

            mStreams[idx].mNewUri.clear();

            mStreams[idx].mNewUri.clear();
@@ -2033,7 +2033,7 @@ void LiveSession::tryToFinishBandwidthSwitch(const AString &oldUri) { 
        CHECK(idx >= 0);

        CHECK(idx >= 0);

        if (mStreams[idx].mNewUri.empty()) {

        if (mStreams[idx].mNewUri.empty()) {

            ALOGW("swapping extra stream type %d %s to empty stream",

            ALOGW("swapping extra stream type %d %s to empty stream",

                    stream, mStreams[idx].mUri.c_str());

                    stream, uriDebugString(mStreams[idx].mUri).c_str());

        }

        }

        mStreams[idx].mUri = mStreams[idx].mNewUri;

        mStreams[idx].mUri = mStreams[idx].mNewUri;

        mStreams[idx].mNewUri.clear();

        mStreams[idx].mNewUri.clear();
@@ -2138,7 +2138,7 @@ void LiveSession::cancelBandwidthSwitch(bool resume) { 
            ALOGV("stopping newUri = %s", newUri.c_str());

            ALOGV("stopping newUri = %s", newUri.c_str());

            ssize_t index = mFetcherInfos.indexOfKey(newUri);

            ssize_t index = mFetcherInfos.indexOfKey(newUri);

            if (index < 0) {

            if (index < 0) {

                ALOGE("did not find fetcher for newUri: %s", newUri.c_str());

                ALOGE("did not find fetcher for newUri: %s", uriDebugString(newUri).c_str());

                continue;

                continue;

            }

            }

            FetcherInfo &info = mFetcherInfos.editValueAt(index);

            FetcherInfo &info = mFetcherInfos.editValueAt(index);

media/libstagefright/httplive/M3UParser.cpp

+1 −2
Original line number Original line Diff line number Diff line
@@ -1205,8 +1205,7 @@ status_t M3UParser::parseMedia(const AString &line) { 
            if (val.size() < 2

            if (val.size() < 2

                    || val.c_str()[0] != '"'

                    || val.c_str()[0] != '"'

                    || val.c_str()[val.size() - 1] != '"') {

                    || val.c_str()[val.size() - 1] != '"') {

                ALOGE("Expected quoted string for URI, got '%s' instead.",

                ALOGE("Expected quoted string for URI.");

                      val.c_str());





                return ERROR_MALFORMED;

                return ERROR_MALFORMED;

            }

            }

media/libstagefright/httplive/PlaylistFetcher.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -365,10 +365,10 @@ status_t PlaylistFetcher::decryptBuffer( 
        if (err == ERROR_NOT_CONNECTED) {

        if (err == ERROR_NOT_CONNECTED) {

            return ERROR_NOT_CONNECTED;

            return ERROR_NOT_CONNECTED;

        } else if (err < 0) {

        } else if (err < 0) {

            ALOGE("failed to fetch cipher key from '%s'.", keyURI.c_str());

            ALOGE("failed to fetch cipher key from '%s'.", uriDebugString(keyURI).c_str());

            return ERROR_IO;

            return ERROR_IO;

        } else if (key->size() != 16) {

        } else if (key->size() != 16) {

            ALOGE("key file '%s' wasn't 16 bytes in size.", keyURI.c_str());

            ALOGE("key file '%s' wasn't 16 bytes in size.", uriDebugString(keyURI).c_str());

            return ERROR_MALFORMED;

            return ERROR_MALFORMED;

        }

        }
@@ -1366,7 +1366,7 @@ void PlaylistFetcher::onDownloadNext() { 
        }

        }

        if (bytesRead < 0) {

        if (bytesRead < 0) {

            status_t err = bytesRead;

            status_t err = bytesRead;

            ALOGE("failed to fetch .ts segment at url '%s'", uri.c_str());

            ALOGE("failed to fetch .ts segment at url '%s'", uriDebugString(uri).c_str());

            notifyError(err);

            notifyError(err);

            return;

            return;

        }

        }

media/libstagefright/rtsp/ARTSPConnection.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -255,7 +255,7 @@ void ARTSPConnection::onConnect(const sp<AMessage> &msg) { 




    struct hostent *ent = gethostbyname(host.c_str());

    struct hostent *ent = gethostbyname(host.c_str());

    if (ent == NULL) {

    if (ent == NULL) {

        ALOGE("Unknown host %s", host.c_str());

        ALOGE("Unknown host %s", uriDebugString(host).c_str());





        reply->setInt32("result", -ENOENT);

        reply->setInt32("result", -ENOENT);

        reply->post();

        reply->post();

media/libstagefright/rtsp/ASessionDescription.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -80,7 +80,7 @@ bool ASessionDescription::parse(const void *data, size_t size) { 
            return false;

            return false;

        }

        }





        ALOGI("%s", line.c_str());

        ALOGV("%s", line.c_str());





        switch (line.c_str()[0]) {

        switch (line.c_str()[0]) {

            case 'v':

            case 'v':