commit 5f881c631d3a8e2c0801cdfbbe465c355816f1e3
author Lajos Molnar <lajos@google.com> Thu Jul 17 00:15:21 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 16 23:37:00 2014 +0000
tree 0ffe3ff1c4f02e08e29d42dc3c1481c4934f6e90
parent dd235727a1b4e283deeb581559f99c2c8889da07
parent 5154f98277922aba7103ac19529ecc00b1889c1e

Merge "M3UParser: check for NULL before setting meta data" into lmp-dev

media/libstagefright/httplive/M3UParser.cpp

diff --git a/media/libstagefright/httplive/M3UParser.cpp b/media/libstagefright/httplive/M3UParser.cpp
index 4f7668c..efd852c 100644
--- a/media/libstagefright/httplive/M3UParser.cpp
+++ b/media/libstagefright/httplive/M3UParser.cpp
@@ -730,6 +730,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())
@@ -753,6 +756,9 @@
             }
 
             key.tolower();
+            if (meta->get() == NULL) {
+                *meta = new AMessage;
+            }
             (*meta)->setString(key.c_str(), groupID.c_str());
         }
     }