commit cfb125bf2ad434279ae58fef6d8d11c70b303964
author Robert Shih <robertshih@google.com> Wed Jul 16 15:27:43 2014 -0700
committer Lajos Molnar <lajos@google.com> Wed Jul 16 17:15:51 2014 -0700
tree 0da93359001602b2931b95e23b8e2f804a303bbb
parent f839b8b435fbddca48ac2b65de397ea91c7260a3

M3UParser: check for NULL before setting meta data

Bug:16351654
Change-Id: I64e9510f719b220471522b4d78a9b00a98bda772

media/libstagefright/httplive/M3UParser.cpp

diff --git a/media/libstagefright/httplive/M3UParser.cpp b/media/libstagefright/httplive/M3UParser.cpp
index 451bc5f..0700de0 100644
--- a/media/libstagefright/httplive/M3UParser.cpp
+++ b/media/libstagefright/httplive/M3UParser.cpp
@@ -715,6 +715,9 @@
 
             key.tolower();
             const AString &codecs = unquoteString(val);
+            if (meta->get() == NULL) {
+                *meta = new AMessage;
+            }
             (*meta)->setString(key.c_str(), codecs.c_str());
         } else if (!strcasecmp("audio", key.c_str())
                 || !strcasecmp("video", key.c_str())
@@ -738,6 +741,9 @@
             }
 
             key.tolower();
+            if (meta->get() == NULL) {
+                *meta = new AMessage;
+            }
             (*meta)->setString(key.c_str(), groupID.c_str());
         }
     }