commit 9476864f6a9b8d500f6c74ba40bfd2e1ce5265a2
author Robert Shih <robertshih@google.com> Wed Jan 04 19:32:14 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 04 19:32:14 2017 +0000
tree 7bb46b82daab0d20b12853017f65164fc822f2c9
parent 4a5a723fc69fb80708970f1c9effe77aa67972dd
parent 53607243f11c4f36b0d966f71580f587e5fc2916

Merge "HTTPLIVE: do not store hash of malformed M3U8 file" am: e8b14c3c5c am: f1d93381be am: ab438ff052
am: 53607243f1

Change-Id: I579928687f836ebbb0097d205d26c08a28904a8e

media/libstagefright/httplive/HTTPDownloader.cpp

diff --git a/media/libstagefright/httplive/HTTPDownloader.cpp b/media/libstagefright/httplive/HTTPDownloader.cpp
index 861b85a..793695a 100644
--- a/media/libstagefright/httplive/HTTPDownloader.cpp
+++ b/media/libstagefright/httplive/HTTPDownloader.cpp
@@ -256,10 +256,6 @@
 
         return NULL;
     }
-
-    if (curPlaylistHash != NULL) {
-        memcpy(curPlaylistHash, hash, sizeof(hash));
-    }
 #endif
 
     sp<M3UParser> playlist =
@@ -271,6 +267,13 @@
         return NULL;
     }
 
+#if defined(__ANDROID__)
+    if (curPlaylistHash != NULL) {
+
+        memcpy(curPlaylistHash, hash, sizeof(hash));
+    }
+#endif
+
     return playlist;
 }