commit b919a3a3d38c4b1cbb378c38cc6154a81ebe01c7
author Nick Kralevich <nnk@google.com> Fri Apr 10 23:34:59 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Apr 10 23:34:59 2015 +0000
tree c8f5ca626be607a8235259665ad78749917b64c7
parent 4775930799bd9a9fbad8efe5d338e890dd7444ed
parent 6429079345404932c5be5956efc7154390d2ed0e

am 64290793: Merge "Fix integer underflow in ESDS processing" into klp-dev

* commit '6429079345404932c5be5956efc7154390d2ed0e':
  Fix integer underflow in ESDS processing

media/libstagefright/ESDS.cpp

diff --git a/media/libstagefright/ESDS.cpp b/media/libstagefright/ESDS.cpp
index 4a0c35c..c76bc4a 100644
--- a/media/libstagefright/ESDS.cpp
+++ b/media/libstagefright/ESDS.cpp
@@ -136,6 +136,8 @@
     --size;
 
     if (streamDependenceFlag) {
+        if (size < 2)
+            return ERROR_MALFORMED;
         offset += 2;
         size -= 2;
     }
@@ -145,11 +147,15 @@
             return ERROR_MALFORMED;
         }
         unsigned URLlength = mData[offset];
+        if (URLlength >= size)
+            return ERROR_MALFORMED;
         offset += URLlength + 1;
         size -= URLlength + 1;
     }
 
     if (OCRstreamFlag) {
+        if (size < 2)
+            return ERROR_MALFORMED;
         offset += 2;
         size -= 2;