Merge "Fix integer overflow abort" into rvc-dev

4 years ago · 7f6c727f2b
parent f4cabacb4c 04e8626f14
commit 7f6c727f2b
1 changed files with 5 additions and 1 deletions
--- a/media/extractors/mp4/MPEG4Extractor.cpp
+++ b/media/extractors/mp4/MPEG4Extractor.cpp
@ -5967,7 +5967,11 @@ media_status_t MPEG4Source::read(
                    sampleTime += mElstInitialEmptyEditTicks;
                }
                if (mElstShiftStartTicks > 0){
-                    sampleTime -= mElstShiftStartTicks;
+                    if (sampleTime > mElstShiftStartTicks) {
+                        sampleTime -= mElstShiftStartTicks;
+                    } else {
+                        sampleTime = 0;
+                    }
                }
                targetSampleTimeUs = (sampleTime * 1000000ll) / mTimescale;
            }