commit 97e8b37f946c024d9cad312fd7f1a30f56cb3302
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Nov 09 03:27:51 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 09 03:27:51 2017 +0000
tree e7c2808f80dcec08207877e063a9940ef454148f
parent 918dbc127cd0302a7f768af2ea3bc6f98ed569b6
parent 3a75f043f6911d083e700208efeb457a15dbb479

Merge "Prevent setStartTimeUs from integer overflow"

media/libstagefright/omx/GraphicBufferSource.cpp

diff --git a/media/libstagefright/omx/GraphicBufferSource.cpp b/media/libstagefright/omx/GraphicBufferSource.cpp
index 1917d2a..a70005e 100644
--- a/media/libstagefright/omx/GraphicBufferSource.cpp
+++ b/media/libstagefright/omx/GraphicBufferSource.cpp
@@ -1199,7 +1199,8 @@
     Mutex::Autolock autoLock(mMutex);
 
     mSkipFramesBeforeNs =
-            (skipFramesBeforeUs > 0) ? (skipFramesBeforeUs * 1000) : -1ll;
+            (skipFramesBeforeUs > 0 && skipFramesBeforeUs <= INT64_MAX / 1000) ?
+            (skipFramesBeforeUs * 1000) : -1ll;
 
     return OK;
 }