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

Commit d0b2fa5f authored by Ray Essick's avatar Ray Essick Committed by Android (Google) Code Review
Browse files

Merge "Fix free-after-use for MediaHTTP" into nyc-dev

parents 5ee5d852 dd81e159
Loading
Loading
Loading
Loading
+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());
    }