diff options
| author | Leo Famulari <leo@famulari.name> | 2016-06-12 22:02:04 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2016-06-12 22:09:26 -0400 |
| commit | ee86e7e14859533045e1f7727ae731ba6ba72daf (patch) | |
| tree | a5f51a9c4859a3242b46876797b98e77a5a7506e /gnu/packages/patches/icecat-CVE-2016-2818-pt2.patch | |
| parent | 8af5cac527eee03005f3809578a0d8258a878f95 (diff) | |
| parent | fe585be9aa8f5158a7dfb6477d19ece3d643dec3 (diff) | |
| download | guix-ee86e7e14859533045e1f7727ae731ba6ba72daf.tar guix-ee86e7e14859533045e1f7727ae731ba6ba72daf.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/patches/icecat-CVE-2016-2818-pt2.patch')
| -rw-r--r-- | gnu/packages/patches/icecat-CVE-2016-2818-pt2.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/gnu/packages/patches/icecat-CVE-2016-2818-pt2.patch b/gnu/packages/patches/icecat-CVE-2016-2818-pt2.patch new file mode 100644 index 0000000000..843e2eb244 --- /dev/null +++ b/gnu/packages/patches/icecat-CVE-2016-2818-pt2.patch @@ -0,0 +1,29 @@ + changeset: 312044:09418166fd77 + user: Jon Coppeard <jcoppeard@mozilla.com> + Date: Wed May 11 10:14:45 2016 +0100 + summary: Bug 1264575 - Add missing pre-barrier in Ion r=jandem a=ritu + +diff -r 9cc65cca1f71 -r 09418166fd77 js/src/jit-test/tests/self-hosting/bug1264575.js +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ b/js/src/jit-test/tests/self-hosting/bug1264575.js Wed May 11 10:14:45 2016 +0100 +@@ -0,0 +1,7 @@ ++function f(x, [y]) {} ++f(0, []); ++// jsfunfuzz-generated ++let i = 0; ++for (var z of [0, 0, 0]) { ++ verifyprebarriers(); ++} +diff -r 9cc65cca1f71 -r 09418166fd77 js/src/jit/MCallOptimize.cpp +--- a/js/src/jit/MCallOptimize.cpp Mon May 16 15:11:24 2016 -0400 ++++ b/js/src/jit/MCallOptimize.cpp Wed May 11 10:14:45 2016 +0100 +@@ -2263,7 +2263,8 @@ + + callInfo.setImplicitlyUsedUnchecked(); + +- MStoreFixedSlot* store = MStoreFixedSlot::New(alloc(), callInfo.getArg(0), slot, callInfo.getArg(2)); ++ MStoreFixedSlot* store = ++ MStoreFixedSlot::NewBarriered(alloc(), callInfo.getArg(0), slot, callInfo.getArg(2)); + current->add(store); + current->push(store); + |