diff options
| author | Mark H Weaver <mhw@netris.org> | 2016-10-12 09:28:14 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2016-10-12 09:28:14 -0400 |
| commit | abcf4858cda9ded59671681ab9820b5358d8bb16 (patch) | |
| tree | fd1b0a53affad3ad0eb9b3867a2c127228530973 /gnu/packages/patches/icecat-CVE-2016-2818-pt3.patch | |
| parent | 82adf4952ac1c03af3b41851ef4bbe1d2d6935a0 (diff) | |
| parent | bfb48f4f33583f58392a05f1d6cbf559156293ed (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/patches/icecat-CVE-2016-2818-pt3.patch')
| -rw-r--r-- | gnu/packages/patches/icecat-CVE-2016-2818-pt3.patch | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/gnu/packages/patches/icecat-CVE-2016-2818-pt3.patch b/gnu/packages/patches/icecat-CVE-2016-2818-pt3.patch deleted file mode 100644 index fab003158c..0000000000 --- a/gnu/packages/patches/icecat-CVE-2016-2818-pt3.patch +++ /dev/null @@ -1,18 +0,0 @@ - changeset: 312051:9ec3d076fbee - parents: 312049:e0a272d5e162 - user: Eric Faust <efaustbmo@gmail.com> - Date: Wed May 04 15:54:43 2016 -0700 - summary: Bug 1269729 - Handle another OOM case on ARM. (r=jolesen) a=ritu - -diff -r e0a272d5e162 -r 9ec3d076fbee js/src/jit/arm/CodeGenerator-arm.cpp ---- a/js/src/jit/arm/CodeGenerator-arm.cpp Tue May 17 08:26:37 2016 -0400 -+++ b/js/src/jit/arm/CodeGenerator-arm.cpp Wed May 04 15:54:43 2016 -0700 -@@ -1116,7 +1116,7 @@ - for (int32_t i = 0; i < cases; i++) { - CodeLabel cl; - masm.writeCodePointer(cl.dest()); -- ool->addCodeLabel(cl); -+ masm.propagateOOM(ool->addCodeLabel(cl)); - } - addOutOfLineCode(ool, mir); - } |