diff options
| author | esum <esum@chromium.org> | 2015-08-04 15:11:06 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-04 22:12:22 +0000 |
| commit | 916455eb7da1baf9d50ebe0400b086a3d795a09b (patch) | |
| tree | 201b17a3253e6441b8e44f7480fc82cb6fe2f0f3 /media/capture | |
| parent | 090a2f79d77f280913c4b4afe0d4f8ee01ac34fa (diff) | |
| download | chromium_src-916455eb7da1baf9d50ebe0400b086a3d795a09b.zip chromium_src-916455eb7da1baf9d50ebe0400b086a3d795a09b.tar.gz chromium_src-916455eb7da1baf9d50ebe0400b086a3d795a09b.tar.bz2 | |
Strict Overflow Prevention video_capture_oracle.cc
Adding check to video_capture_oracle.cc that prevents strict overflow
warning/error.
BUG=
Review URL: https://codereview.chromium.org/1263273003
Cr-Commit-Position: refs/heads/master@{#341808}
Diffstat (limited to 'media/capture')
| -rw-r--r-- | media/capture/content/video_capture_oracle.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/media/capture/content/video_capture_oracle.cc b/media/capture/content/video_capture_oracle.cc index 3fe9e36..6127996 100644 --- a/media/capture/content/video_capture_oracle.cc +++ b/media/capture/content/video_capture_oracle.cc @@ -335,8 +335,11 @@ void VideoCaptureOracle::SetFrameTimestamp(int frame_number, } bool VideoCaptureOracle::IsFrameInRecentHistory(int frame_number) const { - return ((next_frame_number_ - frame_number) < kMaxFrameTimestamps && - frame_number <= next_frame_number_ && frame_number >= 0); + // Adding (next_frame_number_ >= 0) helps the compiler deduce that there + // is no possibility of overflow here. + return (frame_number >= 0 && next_frame_number_ >= 0 && + frame_number <= next_frame_number_ && + (next_frame_number_ - frame_number) < kMaxFrameTimestamps); } void VideoCaptureOracle::CommitCaptureSizeAndReset( |