Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't crash when parsing DRM MIME types"

Browse Source
This commit is contained in:
Glenn Kasten
2011-02-24 08:17:02 -08:00
committed by Android (Google) Code Review
parent 256d603d11 df0b651236
commit 7b76c8d3fc
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
media/libstagefright/MediaExtractor.cpp
View File

@@ -67,12 +67,19 @@ sp<MediaExtractor> MediaExtractor::Create(
mime, confidence);
}
if (!strncmp(mime, "drm", 3)) {
const char *originalMime = strrchr(mime, '+') + 1;
if (!strncmp(mime, "drm+es_based", 12)) {
// DRM MIME type syntax is "drm+type+original" where
// type is "es_based" or "container_based" and
// original is the content's cleartext MIME type
if (!strncmp(mime, "drm+", 4)) {
const char *originalMime = strchr(mime+4, '+');
if (originalMime == NULL) {
// second + not found
return NULL;
}
++originalMime;
if (!strncmp(mime, "drm+es_based+", 13)) {
return new DRMExtractor(source, originalMime);
} else if (!strncmp(mime, "drm+container_based", 19)) {
} else if (!strncmp(mime, "drm+container_based+", 20)) {
mime = originalMime;
} else {
return NULL;