Merge "HTTPLIVE: do not store hash of malformed M3U8 file" am: e8b14c3c5c am: f1d93381be (53607243) · Commits · e / os / android_frameworks_av

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;
		}