From df0b651236f9f44cdc70e209455e330fe31fc546 Mon Sep 17 00:00:00 2001 From: Glenn Kasten Date: Fri, 18 Feb 2011 15:42:25 -0800 Subject: Don't crash when parsing DRM MIME types Change-Id: I414897c911a6588061ddbb5f05c574e78162dca9 --- media/libstagefright/MediaExtractor.cpp | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/media/libstagefright/MediaExtractor.cpp b/media/libstagefright/MediaExtractor.cpp index dbd0829e881c..d4651c47d95f 100644 --- a/media/libstagefright/MediaExtractor.cpp +++ b/media/libstagefright/MediaExtractor.cpp @@ -67,12 +67,19 @@ sp 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; -- cgit v1.2.3-59-g8ed1b