Merge "Prevent setStartTimeUs from integer overflow"

7 years ago · 97e8b37f94
parent 918dbc127c 3a75f043f6
commit 97e8b37f94
1 changed files with 2 additions and 1 deletions
--- a/media/libstagefright/omx/GraphicBufferSource.cpp
+++ b/media/libstagefright/omx/GraphicBufferSource.cpp
@ -1199,7 +1199,8 @@ status_t GraphicBufferSource::setStartTimeUs(int64_t skipFramesBeforeUs) {
    Mutex::Autolock autoLock(mMutex);

    mSkipFramesBeforeNs =
-            (skipFramesBeforeUs > 0) ? (skipFramesBeforeUs * 1000) : -1ll;
+            (skipFramesBeforeUs > 0 && skipFramesBeforeUs <= INT64_MAX / 1000) ?
+            (skipFramesBeforeUs * 1000) : -1ll;

    return OK;
 }