diff options
| author | Lajos Molnar <lajos@google.com> | 2014-07-17 00:16:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-16 23:44:46 +0000 |
| commit | 2e25819fffbb23d42541ead1bf735f3a02fa0330 (patch) | |
| tree | 0da93359001602b2931b95e23b8e2f804a303bbb | |
| parent | f839b8b435fbddca48ac2b65de397ea91c7260a3 (diff) | |
| parent | cfb125bf2ad434279ae58fef6d8d11c70b303964 (diff) | |
| download | frameworks_av-2e25819fffbb23d42541ead1bf735f3a02fa0330.zip frameworks_av-2e25819fffbb23d42541ead1bf735f3a02fa0330.tar.gz frameworks_av-2e25819fffbb23d42541ead1bf735f3a02fa0330.tar.bz2 | |
Merge "M3UParser: check for NULL before setting meta data"
| -rw-r--r-- | media/libstagefright/httplive/M3UParser.cpp | 6 |
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()); } } |