commit 3f252fe9799ce4022db7768f63aa2d3acf7f82d6
author Dongwon Kang <dwkang@google.com> Mon Jun 24 14:14:38 2019 -0700
committer Bryan Ferris <bferris@google.com> Mon Feb 24 12:25:20 2020 -0800
tree b3c04ff8b87023e9f27a841245b54b6d97c63d08
parent 6081cd380a88f04a0f2667c0f557c936645564bd

MPEG4Extractor: check the default sample info before checking the validity of sample size.

Test: atest MediaPlayerDrmTest
Bug: 135215092, Bug: 124525515
Change-Id: I6383514acaf546734b320224342a61cbd362c4bf

media/extractors/mp4/MPEG4Extractor.cpp

diff --git a/media/extractors/mp4/MPEG4Extractor.cpp b/media/extractors/mp4/MPEG4Extractor.cpp
index 5d693a1..cb845c4 100755
--- a/media/extractors/mp4/MPEG4Extractor.cpp
+++ b/media/extractors/mp4/MPEG4Extractor.cpp
@@ -5053,15 +5053,15 @@
     mCurrentSampleInfoCount = smplcnt;
     offset += 4;
     size -= 4;
+    if (mCurrentDefaultSampleInfoSize != 0) {
+        ALOGV("@@@@ using default sample info size of %d", mCurrentDefaultSampleInfoSize);
+        return OK;
+    }
     if(smplcnt > size) {
         ALOGW("b/124525515 - smplcnt(%u) > size(%ld)", (unsigned int)smplcnt, (unsigned long)size);
         android_errorWriteLog(0x534e4554, "124525515");
         return -EINVAL;
     }
-    if (mCurrentDefaultSampleInfoSize != 0) {
-        ALOGV("@@@@ using default sample info size of %d", mCurrentDefaultSampleInfoSize);
-        return OK;
-    }
     if (smplcnt > mCurrentSampleInfoAllocSize) {
         uint8_t * newPtr =  (uint8_t*) realloc(mCurrentSampleInfoSizes, smplcnt);
         if (newPtr == NULL) {