diff options
| author | 2018-01-20 05:35:24 +0000 | |
|---|---|---|
| committer | 2018-01-20 05:35:24 +0000 | |
| commit | 9521c23356c6c257bcf9bc97d55da4197e6a2e2c (patch) | |
| tree | 9ef1253e954c360d32af71e4768885bf70d5e12e | |
| parent | 5c9664cfbcee6ec45152aa8fb5d49f0455967f7e (diff) | |
| parent | 5e92144cbd03008636016d543d5ae620e9b2f65a (diff) | |
Merge "Fix integer overflow in libgui_test Surface_test"
| -rw-r--r-- | libs/gui/tests/Surface_test.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/gui/tests/Surface_test.cpp b/libs/gui/tests/Surface_test.cpp index cd29d4a667..8060b6e7c5 100644 --- a/libs/gui/tests/Surface_test.cpp +++ b/libs/gui/tests/Surface_test.cpp @@ -22,6 +22,7 @@ #include <binder/ProcessState.h> #include <configstore/Utils.h> #include <cutils/properties.h> +#include <inttypes.h> #include <gui/BufferItemConsumer.h> #include <gui/IDisplayEventConnection.h> #include <gui/IProducerListener.h> @@ -869,7 +870,7 @@ protected: (iOldFrame == NO_FRAME_INDEX) ? nullptr : &mFrames[iOldFrame]; FrameEvents* newFrame = &mFrames[iNewFrame]; - uint64_t nOldFrame = iOldFrame + 1; + uint64_t nOldFrame = (iOldFrame == NO_FRAME_INDEX) ? 0 : iOldFrame + 1; uint64_t nNewFrame = iNewFrame + 1; // Latch, Composite, and Release the frames in a plausible order. |