diff options
| author | maya <maya@pkgsrc.org> | 2019-07-09 16:08:38 +0000 |
|---|---|---|
| committer | maya <maya@pkgsrc.org> | 2019-07-09 16:08:38 +0000 |
| commit | ddc1954852d52bbdd673220b9dbfd8b1f6523211 (patch) | |
| tree | 939bbe75edae62c9de208a4e72b1da098806b343 /lang/spidermonkey52 | |
| parent | 65bb866ba38adf116c6154c8eabe19b80348b208 (diff) | |
| download | pkgsrc-ddc1954852d52bbdd673220b9dbfd8b1f6523211.tar.gz | |
spidermonkey52: pour a bucket over this wildfire and backport a security fix.
From https://bugs.chromium.org/p/project-zero/issues/detail?id=1823 / mozjs
upstream.
Bump PKGREVISION
Diffstat (limited to 'lang/spidermonkey52')
| -rw-r--r-- | lang/spidermonkey52/Makefile | 4 | ||||
| -rw-r--r-- | lang/spidermonkey52/distinfo | 3 | ||||
| -rw-r--r-- | lang/spidermonkey52/patches/patch-js_src_jit_IonBuilder.cpp | 27 |
3 files changed, 31 insertions, 3 deletions
diff --git a/lang/spidermonkey52/Makefile b/lang/spidermonkey52/Makefile index da4c981874c..70bbcb77a79 100644 --- a/lang/spidermonkey52/Makefile +++ b/lang/spidermonkey52/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.16 2019/05/24 18:15:38 leot Exp $ +# $NetBSD: Makefile,v 1.17 2019/07/09 16:08:38 maya Exp $ DISTNAME= mozjs-52.7.4 -PKGREVISION= 9 +PKGREVISION= 10 PKGNAME= ${DISTNAME:S/mozjs/spidermonkey52/} CATEGORIES= lang MASTER_SITES= https://queue.taskcluster.net/v1/task/YqG2fjJJSTGzGX090FjDYg/runs/0/artifacts/public/build/ diff --git a/lang/spidermonkey52/distinfo b/lang/spidermonkey52/distinfo index e1cd49cc75a..4104874b0de 100644 --- a/lang/spidermonkey52/distinfo +++ b/lang/spidermonkey52/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2019/05/24 18:15:38 leot Exp $ +$NetBSD: distinfo,v 1.7 2019/07/09 16:08:38 maya Exp $ SHA1 (mozjs-52.7.4.tar.bz2) = ff009853040bb46017204fda4ed69a79484fd321 RMD160 (mozjs-52.7.4.tar.bz2) = 71ee71c2444d8b6a1b2b3c744c9f52a2b7129879 @@ -9,6 +9,7 @@ SHA1 (patch-build_moz.configure_init.configure) = 63ed71d4269e8fbf990f44eecadca7 SHA1 (patch-config_gcc__hidden.h) = c2042035288e01601b6c240fb08c8a1f598b9dfd SHA1 (patch-intl_icu_source_configure) = 1ff1be8ca68566e153219e15b8db696afd08b746 SHA1 (patch-js_src_gc_Memory.cpp) = b1bb0c3045163d586c0b4d731d0ed7c23f339f3c +SHA1 (patch-js_src_jit_IonBuilder.cpp) = b8be1d71d01c5f0e1b1016500be862b73e68df1b SHA1 (patch-js_src_jsnativestack.cpp) = 3d0b06ccc3e24b408b97d01faa7758353f2edc85 SHA1 (patch-js_src_old-configure_in) = 4fd3df4abde94758429d943641e1bd7bad3ca926 SHA1 (patch-js_src_tests_update-test262.sh) = 10d73d95f4b849090bccb8fe656df79cbcea89f3 diff --git a/lang/spidermonkey52/patches/patch-js_src_jit_IonBuilder.cpp b/lang/spidermonkey52/patches/patch-js_src_jit_IonBuilder.cpp new file mode 100644 index 00000000000..dcba9011a23 --- /dev/null +++ b/lang/spidermonkey52/patches/patch-js_src_jit_IonBuilder.cpp @@ -0,0 +1,27 @@ +$NetBSD: patch-js_src_jit_IonBuilder.cpp,v 1.1 2019/07/09 16:08:38 maya Exp $ + +# HG changeset patch +# User Jan de Mooij <jdemooij@mozilla.com> +# Date 1556819484 0 +# Node ID dbd28ea2e13c17d9566a8a95370b87a6d3341e71 +# Parent 76d84e7aeb3ffc34d0d52cc4adc89bd6ddd0c2e7 +Bug 1544792 - Abort on try-catch blocks when doing definite properties analysis. r=nbp, a=pascalc + +Ion does not compile the catch block so the analysis fails to account for code +there. + +Differential Revision: https://phabricator.services.mozilla.com/D29475 + +--- js/src/jit/IonBuilder.cpp.orig 2018-04-28 01:04:03.000000000 +0000 ++++ js/src/jit/IonBuilder.cpp +@@ -4540,6 +4540,10 @@ IonBuilder::jsop_try() + // accessing the arguments within the 'catch' block is not accounted for. + if (info().analysisMode() == Analysis_ArgumentsUsage) + return abort("Try-catch during arguments usage analysis"); ++ // Try-catch during analyses is not yet supported. Code within the 'catch' ++ // block is not accounted for. ++ if (info().isAnalysis()) ++ return abort("Try-catch during analysis"); + + graph().setHasTryBlock(); + |