commit cd9904f907ef4c248cca64efbc1f04bcc76e835b Author: Mike Perry mikeperry-git@torproject.org Date: Thu Aug 28 18:30:06 2014 -0700

fixup! Backport two integer overflow patches.

These are in the mozilla namespace. --- image/src/imgFrame.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/image/src/imgFrame.cpp b/image/src/imgFrame.cpp index 33d1b3a..0e2ef3f 100644 --- a/image/src/imgFrame.cpp +++ b/image/src/imgFrame.cpp @@ -55,7 +55,7 @@ static bool AllowedImageSize(int32_t aWidth, int32_t aHeight) }

// check to make sure we don't overflow a 32-bit - CheckedInt32 requiredBytes = CheckedInt32(aWidth) * CheckedInt32(aHeight) * 4; + mozilla::CheckedInt32 requiredBytes = mozilla::CheckedInt32(aWidth) * mozilla::CheckedInt32(aHeight) * 4; if (MOZ_UNLIKELY(!requiredBytes.isValid())) { NS_WARNING("width or height too large"); return false;