summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorRobert Shih <robertshih@google.com>2014-07-16 15:27:43 -0700
committerLajos Molnar <lajos@google.com>2014-07-16 17:15:51 -0700
commitcfb125bf2ad434279ae58fef6d8d11c70b303964 (patch)
tree0da93359001602b2931b95e23b8e2f804a303bbb /media
parentf839b8b435fbddca48ac2b65de397ea91c7260a3 (diff)
downloadframeworks_av-cfb125bf2ad434279ae58fef6d8d11c70b303964.zip
frameworks_av-cfb125bf2ad434279ae58fef6d8d11c70b303964.tar.gz
frameworks_av-cfb125bf2ad434279ae58fef6d8d11c70b303964.tar.bz2
M3UParser: check for NULL before setting meta data
Bug:16351654 Change-Id: I64e9510f719b220471522b4d78a9b00a98bda772
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/httplive/M3UParser.cpp6
1 files changed, 6 insertions, 0 deletions
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 @@ status_t M3UParser::parseStreamInf(
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 @@ status_t M3UParser::parseStreamInf(
}
key.tolower();
+ if (meta->get() == NULL) {
+ *meta = new AMessage;
+ }
(*meta)->setString(key.c_str(), groupID.c_str());
}
}