diff options
author | Mark H Weaver <mhw@netris.org> | 2016-02-05 12:17:00 -0500 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2016-02-05 16:00:25 -0500 |
commit | a7d8c466db633bbdf10c0aebce7128c627c28342 (patch) | |
tree | 0c3b0d8023c548a36c1b3476c039e2e5908d9fb5 /gnu/packages/patches/icecat-CVE-2016-1930-pt14.patch | |
parent | 95b754a17ad3192086a9e8ce514e25d980039d50 (diff) | |
download | guix-a7d8c466db633bbdf10c0aebce7128c627c28342.tar.gz |
gnu: icecat: Update to 38.6.0-gnu1.
* gnu/packages/patches/icecat-bug-1146335-pt1.patch, gnu/packages/patches/icecat-bug-1146335-pt2.patch, gnu/packages/patches/icecat-limit-max-buffers-size-for-ANGLE.patch, gnu/packages/patches/icecat-CVE-2016-1930-pt01.patch, gnu/packages/patches/icecat-CVE-2016-1930-pt02.patch, gnu/packages/patches/icecat-CVE-2016-1930-pt03.patch, gnu/packages/patches/icecat-CVE-2016-1930-pt04.patch, gnu/packages/patches/icecat-CVE-2016-1930-pt05.patch, gnu/packages/patches/icecat-CVE-2016-1930-pt06.patch, gnu/packages/patches/icecat-CVE-2016-1930-pt07.patch, gnu/packages/patches/icecat-CVE-2016-1930-pt08.patch, gnu/packages/patches/icecat-CVE-2016-1930-pt09.patch, gnu/packages/patches/icecat-CVE-2016-1930-pt10.patch, gnu/packages/patches/icecat-CVE-2016-1930-pt11.patch, gnu/packages/patches/icecat-CVE-2016-1930-pt12.patch, gnu/packages/patches/icecat-CVE-2016-1930-pt13.patch, gnu/packages/patches/icecat-CVE-2016-1930-pt14.patch, gnu/packages/patches/icecat-CVE-2016-1930-pt15.patch, gnu/packages/patches/icecat-CVE-2016-1935.patch: Delete files. * gnu-system.am (dist_patch_DATA): Remove them. * gnu/packages/gnuzilla.scm (icecat): Update to 38.6.0-gnu1. [source]: Remove patches.
Diffstat (limited to 'gnu/packages/patches/icecat-CVE-2016-1930-pt14.patch')
-rw-r--r-- | gnu/packages/patches/icecat-CVE-2016-1930-pt14.patch | 83 |
1 files changed, 0 insertions, 83 deletions
diff --git a/gnu/packages/patches/icecat-CVE-2016-1930-pt14.patch b/gnu/packages/patches/icecat-CVE-2016-1930-pt14.patch deleted file mode 100644 index 02c1af1775..0000000000 --- a/gnu/packages/patches/icecat-CVE-2016-1930-pt14.patch +++ /dev/null @@ -1,83 +0,0 @@ -Copied from: https://hg.mozilla.org/releases/mozilla-esr38/rev/94a95291d095 -Security advisory: https://www.mozilla.org/en-US/security/advisories/mfsa2016-01/ -Mozilla Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1224200 - -# HG changeset patch -# User Timothy Nikkel <tnikkel@gmail.com> -# Date 1453303652 -3600 -# Node ID 94a95291d0958439dbed5b7dc99fae59e1318592 -# Parent 999c13acb40e1113306c65925a7d96688339d945 -Bug 1224200 - Allow downscaler to get (and ignore) new input lines after it has finished producing all output lines. r=seth, a=lizzard - -diff --git a/image/src/Downscaler.cpp b/image/src/Downscaler.cpp ---- a/image/src/Downscaler.cpp -+++ b/image/src/Downscaler.cpp -@@ -145,43 +145,44 @@ GetFilterOffsetAndLength(UniquePtr<skia: - aFilterLengthOut); - } - - void - Downscaler::CommitRow() - { - MOZ_ASSERT(mOutputBuffer, "Should have a current frame"); - MOZ_ASSERT(mCurrentInLine < mOriginalSize.height, "Past end of input"); -- MOZ_ASSERT(mCurrentOutLine < mTargetSize.height, "Past end of output"); - -- int32_t filterOffset = 0; -- int32_t filterLength = 0; -- GetFilterOffsetAndLength(mYFilter, mCurrentOutLine, -- &filterOffset, &filterLength); -+ if (mCurrentOutLine < mTargetSize.height) { -+ int32_t filterOffset = 0; -+ int32_t filterLength = 0; -+ GetFilterOffsetAndLength(mYFilter, mCurrentOutLine, -+ &filterOffset, &filterLength); - -- int32_t inLineToRead = filterOffset + mLinesInBuffer; -- MOZ_ASSERT(mCurrentInLine <= inLineToRead, "Reading past end of input"); -- if (mCurrentInLine == inLineToRead) { -- skia::ConvolveHorizontally(mRowBuffer.get(), *mXFilter, -- mWindow[mLinesInBuffer++], mHasAlpha, -- /* use_sse2 = */ true); -- } -- -- MOZ_ASSERT(mCurrentOutLine < mTargetSize.height, -- "Writing past end of output"); -- -- while (mLinesInBuffer == filterLength) { -- DownscaleInputLine(); -- -- if (mCurrentOutLine == mTargetSize.height) { -- break; // We're done. -+ int32_t inLineToRead = filterOffset + mLinesInBuffer; -+ MOZ_ASSERT(mCurrentInLine <= inLineToRead, "Reading past end of input"); -+ if (mCurrentInLine == inLineToRead) { -+ skia::ConvolveHorizontally(mRowBuffer.get(), *mXFilter, -+ mWindow[mLinesInBuffer++], mHasAlpha, -+ /* use_sse2 = */ true); - } - -- GetFilterOffsetAndLength(mYFilter, mCurrentOutLine, -- &filterOffset, &filterLength); -+ MOZ_ASSERT(mCurrentOutLine < mTargetSize.height, -+ "Writing past end of output"); -+ -+ while (mLinesInBuffer == filterLength) { -+ DownscaleInputLine(); -+ -+ if (mCurrentOutLine == mTargetSize.height) { -+ break; // We're done. -+ } -+ -+ GetFilterOffsetAndLength(mYFilter, mCurrentOutLine, -+ &filterOffset, &filterLength); -+ } - } - - mCurrentInLine += 1; - } - - bool - Downscaler::HasInvalidation() const - { - |