diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-05-21 15:17:40 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-05-21 15:17:40 -0700 |
| commit | 721780d0d08d35e666993fa37149a2f101b100ed (patch) | |
| tree | 309abb9ebaabdba8c325b310fbb20d1c487a8c57 /third_party/base | |
| parent | 9519225db88d59280671c5a5fa227af0700b2d29 (diff) | |
| download | pdfium-721780d0d08d35e666993fa37149a2f101b100ed.tar.xz | |
Merge to XFA: Update copy of safe_math_impl.h to take a fix from upstream.
Original Review URL: https://codereview.chromium.org/1126243007
BUG=488302
TBR=eroman@chromium.org
Review URL: https://codereview.chromium.org/1153543003
Diffstat (limited to 'third_party/base')
| -rw-r--r-- | third_party/base/numerics/safe_math_impl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/third_party/base/numerics/safe_math_impl.h b/third_party/base/numerics/safe_math_impl.h index f9a4a71570..14897202bd 100644 --- a/third_party/base/numerics/safe_math_impl.h +++ b/third_party/base/numerics/safe_math_impl.h @@ -178,8 +178,8 @@ typename enable_if<std::numeric_limits<T>::is_integer&& std::numeric_limits< T>::is_signed&&(sizeof(T) * 2 > sizeof(uintmax_t)), T>::type CheckedMul(T x, T y, RangeConstraint* validity) { - // if either side is zero then the result will be zero. - if (!(x || y)) { + // If either side is zero then the result will be zero. + if (!x || !y) { return RANGE_VALID; } else if (x > 0) { |