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

Commit 9476864f authored by Robert Shih's avatar Robert Shih Committed by android-build-merger
Browse files

Merge "HTTPLIVE: do not store hash of malformed M3U8 file" am: e8b14c3c am:... 

Merge "HTTPLIVE: do not store hash of malformed M3U8 file" am: e8b14c3c am: f1d93381 am: ab438ff0
am: 53607243

Change-Id: I579928687f836ebbb0097d205d26c08a28904a8e
parents 4a5a723f 53607243

media/libstagefright/httplive/HTTPDownloader.cpp

+7 −4
Original line number Diff line number Diff line
@@ -256,10 +256,6 @@ sp<M3UParser> HTTPDownloader::fetchPlaylist( 


        return NULL;

    }



    if (curPlaylistHash != NULL) {

        memcpy(curPlaylistHash, hash, sizeof(hash));

    }

#endif



    sp<M3UParser> playlist =
@@ -271,6 +267,13 @@ sp<M3UParser> HTTPDownloader::fetchPlaylist( 
        return NULL;

    }



#if defined(__ANDROID__)

    if (curPlaylistHash != NULL) {



        memcpy(curPlaylistHash, hash, sizeof(hash));

    }

#endif



    return playlist;

}