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

Commit dd81e159 authored by Ray Essick's avatar Ray Essick
Browse files

Fix free-after-use for MediaHTTP 

fix free-after-use when we reconnect to an HTTP media source.

Change-Id: I96da5a79f5382409a545f8b4e22a24523f287464
Tests: compilation and eyeballs
Bug: 31373622
parent 20d7cfb6

media/libstagefright/http/MediaHTTP.cpp

+7 −3
Original line number Diff line number Diff line
@@ -58,15 +58,19 @@ status_t MediaHTTP::connect( 
        extHeaders.add(String8("User-Agent"), String8(MakeUserAgent().c_str()));

    }



    bool success = mHTTPConnection->connect(uri, &extHeaders);

    mLastURI = uri;

    // reconnect() calls with uri == old mLastURI.c_str(), which gets zapped

    // as part of the above assignment. Ensure no accidental later use.

    uri = NULL;



    bool success = mHTTPConnection->connect(mLastURI.c_str(), &extHeaders);



    mLastHeaders = extHeaders;

    mLastURI = uri;



    mCachedSizeValid = false;



    if (success) {

        AString sanitized = uriDebugString(uri);

        AString sanitized = uriDebugString(mLastURI);

        mName = String8::format("MediaHTTP(%s)", sanitized.c_str());

    }