Compare commits
No commits in common. 'c9' and 'i8c' have entirely different histories.
@ -1,132 +0,0 @@
|
||||
CMake - Cross Platform Makefile Generator
|
||||
Copyright 2000-2021 Kitware, Inc. and Contributors
|
||||
All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions
|
||||
are met:
|
||||
|
||||
* Redistributions of source code must retain the above copyright
|
||||
notice, this list of conditions and the following disclaimer.
|
||||
|
||||
* Redistributions in binary form must reproduce the above copyright
|
||||
notice, this list of conditions and the following disclaimer in the
|
||||
documentation and/or other materials provided with the distribution.
|
||||
|
||||
* Neither the name of Kitware, Inc. nor the names of Contributors
|
||||
may be used to endorse or promote products derived from this
|
||||
software without specific prior written permission.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
------------------------------------------------------------------------------
|
||||
|
||||
The following individuals and institutions are among the Contributors:
|
||||
|
||||
* Aaron C. Meadows <cmake@shadowguarddev.com>
|
||||
* Adriaan de Groot <groot@kde.org>
|
||||
* Aleksey Avdeev <solo@altlinux.ru>
|
||||
* Alexander Neundorf <neundorf@kde.org>
|
||||
* Alexander Smorkalov <alexander.smorkalov@itseez.com>
|
||||
* Alexey Sokolov <sokolov@google.com>
|
||||
* Alex Merry <alex.merry@kde.org>
|
||||
* Alex Turbov <i.zaufi@gmail.com>
|
||||
* Andreas Pakulat <apaku@gmx.de>
|
||||
* Andreas Schneider <asn@cryptomilk.org>
|
||||
* André Rigland Brodtkorb <Andre.Brodtkorb@ifi.uio.no>
|
||||
* Axel Huebl, Helmholtz-Zentrum Dresden - Rossendorf
|
||||
* Benjamin Eikel
|
||||
* Bjoern Ricks <bjoern.ricks@gmail.com>
|
||||
* Brad Hards <bradh@kde.org>
|
||||
* Christopher Harvey
|
||||
* Christoph Grüninger <foss@grueninger.de>
|
||||
* Clement Creusot <creusot@cs.york.ac.uk>
|
||||
* Daniel Blezek <blezek@gmail.com>
|
||||
* Daniel Pfeifer <daniel@pfeifer-mail.de>
|
||||
* Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
|
||||
* Eran Ifrah <eran.ifrah@gmail.com>
|
||||
* Esben Mose Hansen, Ange Optimization ApS
|
||||
* Geoffrey Viola <geoffrey.viola@asirobots.com>
|
||||
* Google Inc
|
||||
* Gregor Jasny
|
||||
* Helio Chissini de Castro <helio@kde.org>
|
||||
* Ilya Lavrenov <ilya.lavrenov@itseez.com>
|
||||
* Insight Software Consortium <insightsoftwareconsortium.org>
|
||||
* Jan Woetzel
|
||||
* Julien Schueller
|
||||
* Kelly Thompson <kgt@lanl.gov>
|
||||
* Konstantin Podsvirov <konstantin@podsvirov.pro>
|
||||
* Laurent Montel <montel@kde.org>
|
||||
* Mario Bensi <mbensi@ipsquad.net>
|
||||
* Martin Gräßlin <mgraesslin@kde.org>
|
||||
* Mathieu Malaterre <mathieu.malaterre@gmail.com>
|
||||
* Matthaeus G. Chajdas
|
||||
* Matthias Kretz <kretz@kde.org>
|
||||
* Matthias Maennich <matthias@maennich.net>
|
||||
* Michael Hirsch, Ph.D. <www.scivision.co>
|
||||
* Michael Stürmer
|
||||
* Miguel A. Figueroa-Villanueva
|
||||
* Mike Jackson
|
||||
* Mike McQuaid <mike@mikemcquaid.com>
|
||||
* Nicolas Bock <nicolasbock@gmail.com>
|
||||
* Nicolas Despres <nicolas.despres@gmail.com>
|
||||
* Nikita Krupen'ko <krnekit@gmail.com>
|
||||
* NVIDIA Corporation <www.nvidia.com>
|
||||
* OpenGamma Ltd. <opengamma.com>
|
||||
* Patrick Stotko <stotko@cs.uni-bonn.de>
|
||||
* Per Øyvind Karlsen <peroyvind@mandriva.org>
|
||||
* Peter Collingbourne <peter@pcc.me.uk>
|
||||
* Petr Gotthard <gotthard@honeywell.com>
|
||||
* Philip Lowman <philip@yhbt.com>
|
||||
* Philippe Proulx <pproulx@efficios.com>
|
||||
* Raffi Enficiaud, Max Planck Society
|
||||
* Raumfeld <raumfeld.com>
|
||||
* Roger Leigh <rleigh@codelibre.net>
|
||||
* Rolf Eike Beer <eike@sf-mail.de>
|
||||
* Roman Donchenko <roman.donchenko@itseez.com>
|
||||
* Roman Kharitonov <roman.kharitonov@itseez.com>
|
||||
* Ruslan Baratov
|
||||
* Sebastian Holtermann <sebholt@xwmw.org>
|
||||
* Stephen Kelly <steveire@gmail.com>
|
||||
* Sylvain Joubert <joubert.sy@gmail.com>
|
||||
* The Qt Company Ltd.
|
||||
* Thomas Sondergaard <ts@medical-insight.com>
|
||||
* Tobias Hunger <tobias.hunger@qt.io>
|
||||
* Todd Gamblin <tgamblin@llnl.gov>
|
||||
* Tristan Carel
|
||||
* University of Dundee
|
||||
* Vadim Zhukov
|
||||
* Will Dicharry <wdicharry@stellarscience.com>
|
||||
|
||||
See version control history for details of individual contributions.
|
||||
|
||||
The above copyright and license notice applies to distributions of
|
||||
CMake in source and binary form. Third-party software packages supplied
|
||||
with CMake under compatible licenses provide their own copyright notices
|
||||
documented in corresponding subdirectories or source files.
|
||||
|
||||
------------------------------------------------------------------------------
|
||||
|
||||
CMake was initially developed by Kitware with the following sponsorship:
|
||||
|
||||
* National Library of Medicine at the National Institutes of Health
|
||||
as part of the Insight Segmentation and Registration Toolkit (ITK).
|
||||
|
||||
* US National Labs (Los Alamos, Livermore, Sandia) ASC Parallel
|
||||
Visualization Initiative.
|
||||
|
||||
* National Alliance for Medical Image Computing (NAMIC) is funded by the
|
||||
National Institutes of Health through the NIH Roadmap for Medical Research,
|
||||
Grant U54 EB005149.
|
||||
|
||||
* Kitware, Inc.
|
||||
@ -1,38 +0,0 @@
|
||||
From 738785214546ec5bb772886019529b2a6519deaf Mon Sep 17 00:00:00 2001
|
||||
From: Simon McVittie <smcv@debian.org>
|
||||
Date: Fri, 1 May 2020 19:04:22 +0100
|
||||
Subject: [PATCH] mozjs: Avoid use-after-free
|
||||
|
||||
If we don't assign the temporary std::string returned by
|
||||
url_.to_string() to a variable, then it immediately goes out of scope
|
||||
and is freed, resulting in the result of c_str() pointing into freed
|
||||
memory. This works about as well as you would expect.
|
||||
|
||||
Signed-off-by: Simon McVittie <smcv@debian.org>
|
||||
---
|
||||
libproxy/modules/pacrunner_mozjs.cpp | 11 ++++-------
|
||||
1 file changed, 4 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/libproxy/modules/pacrunner_mozjs.cpp b/libproxy/modules/pacrunner_mozjs.cpp
|
||||
index ade6d0a..aac6531 100644
|
||||
--- a/libproxy/modules/pacrunner_mozjs.cpp
|
||||
+++ b/libproxy/modules/pacrunner_mozjs.cpp
|
||||
@@ -175,14 +175,11 @@ class mozjs_pacrunner : public pacrunner {
|
||||
|
||||
string run(const url& url_) throw (bad_alloc) {
|
||||
// Build arguments to the FindProxyForURL() function
|
||||
- const char *tmpurl = url_.to_string().c_str();
|
||||
- const char *tmphost = url_.get_host().c_str();
|
||||
- if (!tmpurl || !tmphost) {
|
||||
- throw bad_alloc();
|
||||
- }
|
||||
+ string tmpurl(url_.to_string());
|
||||
+ string tmphost(url_.get_host());
|
||||
JS::AutoValueArray<2> args(this->jsctx);
|
||||
- args[0].setString(JS_NewStringCopyZ(this->jsctx, tmpurl));
|
||||
- args[1].setString(JS_NewStringCopyZ(this->jsctx, tmphost));
|
||||
+ args[0].setString(JS_NewStringCopyZ(this->jsctx, tmpurl.c_str()));
|
||||
+ args[1].setString(JS_NewStringCopyZ(this->jsctx, tmphost.c_str()));
|
||||
|
||||
// Find the proxy (call FindProxyForURL())
|
||||
JS::RootedValue rval(this->jsctx);
|
||||
@ -1,124 +0,0 @@
|
||||
From f594720280b2e40d81fa6e286a0ef8868687ef7e Mon Sep 17 00:00:00 2001
|
||||
From: Pierre Lejeune <superheron@gmail.com>
|
||||
Date: Sat, 30 Jun 2018 21:10:06 +0200
|
||||
Subject: [PATCH] Build with mozjs-52
|
||||
|
||||
Fixes #71
|
||||
---
|
||||
libproxy/cmake/modules/pacrunner_mozjs.cmk | 2 +-
|
||||
libproxy/modules/pacrunner_mozjs.cpp | 19 +++++++------------
|
||||
2 files changed, 8 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/libproxy/cmake/modules/pacrunner_mozjs.cmk b/libproxy/cmake/modules/pacrunner_mozjs.cmk
|
||||
index c2ae3db..20857fb 100644
|
||||
--- a/libproxy/cmake/modules/pacrunner_mozjs.cmk
|
||||
+++ b/libproxy/cmake/modules/pacrunner_mozjs.cmk
|
||||
@@ -9,7 +9,7 @@ if(WIN32)
|
||||
elseif(NOT APPLE)
|
||||
option(WITH_MOZJS "Search for MOZJS package" ON)
|
||||
if (WITH_MOZJS)
|
||||
- pkg_search_module(MOZJS mozjs-38)
|
||||
+ pkg_search_module(MOZJS mozjs-52)
|
||||
if(MOZJS_FOUND)
|
||||
include_directories(${MOZJS_INCLUDE_DIRS})
|
||||
link_directories(${MOZJS_LIBRARY_DIRS})
|
||||
diff --git a/libproxy/modules/pacrunner_mozjs.cpp b/libproxy/modules/pacrunner_mozjs.cpp
|
||||
index a70b2e9..ed07c69 100644
|
||||
--- a/libproxy/modules/pacrunner_mozjs.cpp
|
||||
+++ b/libproxy/modules/pacrunner_mozjs.cpp
|
||||
@@ -35,6 +35,7 @@ using namespace libproxy;
|
||||
#pragma GCC diagnostic ignored "-Winvalid-offsetof"
|
||||
#include <jsapi.h>
|
||||
#pragma GCC diagnostic error "-Winvalid-offsetof"
|
||||
+#include <js/Initialization.h>
|
||||
#include <js/CallArgs.h>
|
||||
|
||||
#include "pacutils.h"
|
||||
@@ -111,17 +112,14 @@ class mozjs_pacrunner : public pacrunner {
|
||||
mozjs_pacrunner(string pac, const url& pacurl) throw (bad_alloc) : pacrunner(pac, pacurl) {
|
||||
|
||||
// Set defaults
|
||||
- this->jsrun = nullptr;
|
||||
this->jsctx = nullptr;
|
||||
JS_Init();
|
||||
|
||||
- // Initialize Javascript runtime environment
|
||||
- if (!(this->jsrun = JS_NewRuntime(1024 * 1024))) goto error;
|
||||
- if (!(this->jsctx = JS_NewContext(this->jsrun, 1024 * 1024))) goto error;
|
||||
+ // Initialize Javascript context
|
||||
+ if (!(this->jsctx = JS_NewContext(1024 * 1024))) goto error;
|
||||
{
|
||||
JS::RootedValue rval(this->jsctx);
|
||||
JS::CompartmentOptions compart_opts;
|
||||
- compart_opts.setVersion(JSVERSION_LATEST);
|
||||
|
||||
this->jsglb = new JS::Heap<JSObject*>(JS_NewGlobalObject(
|
||||
this->jsctx, &cls,
|
||||
@@ -139,16 +137,15 @@ class mozjs_pacrunner : public pacrunner {
|
||||
JS::CompileOptions options(this->jsctx);
|
||||
options.setUTF8(true);
|
||||
|
||||
- JS::Evaluate(this->jsctx, global, options, JAVASCRIPT_ROUTINES,
|
||||
- strlen(JAVASCRIPT_ROUTINES), &rval);
|
||||
+ JS::Evaluate(this->jsctx, options, JAVASCRIPT_ROUTINES,
|
||||
+ strlen(JAVASCRIPT_ROUTINES), JS::MutableHandleValue(&rval));
|
||||
|
||||
// Add PAC to the environment
|
||||
- JS::Evaluate(this->jsctx, global, options, pac.c_str(), pac.length(), &rval);
|
||||
+ JS::Evaluate(this->jsctx, options, pac.c_str(), pac.length(), JS::MutableHandleValue(&rval));
|
||||
return;
|
||||
}
|
||||
error:
|
||||
if (this->jsctx) JS_DestroyContext(this->jsctx);
|
||||
- if (this->jsrun) JS_DestroyRuntime(this->jsrun);
|
||||
throw bad_alloc();
|
||||
}
|
||||
|
||||
@@ -156,7 +153,6 @@ class mozjs_pacrunner : public pacrunner {
|
||||
if (this->jsac) delete this->jsac;
|
||||
if (this->jsglb) delete this->jsglb;
|
||||
if (this->jsctx) JS_DestroyContext(this->jsctx);
|
||||
- if (this->jsrun) JS_DestroyRuntime(this->jsrun);
|
||||
JS_ShutDown();
|
||||
}
|
||||
|
||||
@@ -178,7 +174,7 @@ class mozjs_pacrunner : public pacrunner {
|
||||
JS::RootedObject global(this->jsctx,this->jsglb->get());
|
||||
bool result = JS_CallFunctionName(this->jsctx, global, "FindProxyForURL", args, &rval);
|
||||
if (!result) return "";
|
||||
-
|
||||
+
|
||||
char * tmpanswer = JS_EncodeString(this->jsctx, rval.toString());
|
||||
string answer = string(tmpanswer);
|
||||
JS_free(this->jsctx, tmpanswer);
|
||||
@@ -188,7 +184,6 @@ class mozjs_pacrunner : public pacrunner {
|
||||
}
|
||||
|
||||
private:
|
||||
- JSRuntime *jsrun;
|
||||
JSContext *jsctx;
|
||||
JS::Heap<JSObject*> *jsglb;
|
||||
JSAutoCompartment *jsac;
|
||||
From a9b052c6e30101fb0b702917f245a3e2a2f08366 Mon Sep 17 00:00:00 2001
|
||||
From: Laurent Bigonville <bigon@bigon.be>
|
||||
Date: Tue, 2 Oct 2018 10:22:56 +0200
|
||||
Subject: [PATCH] Add call to JS::InitSelfHostedCode()
|
||||
|
||||
This is needed otherwise mozjs crashes
|
||||
---
|
||||
libproxy/modules/pacrunner_mozjs.cpp | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/libproxy/modules/pacrunner_mozjs.cpp b/libproxy/modules/pacrunner_mozjs.cpp
|
||||
index ed07c69..38e7d46 100644
|
||||
--- a/libproxy/modules/pacrunner_mozjs.cpp
|
||||
+++ b/libproxy/modules/pacrunner_mozjs.cpp
|
||||
@@ -118,6 +118,8 @@ class mozjs_pacrunner : public pacrunner {
|
||||
// Initialize Javascript context
|
||||
if (!(this->jsctx = JS_NewContext(1024 * 1024))) goto error;
|
||||
{
|
||||
+ if (!JS::InitSelfHostedCode(this->jsctx)) goto error;
|
||||
+
|
||||
JS::RootedValue rval(this->jsctx);
|
||||
JS::CompartmentOptions compart_opts;
|
||||
|
||||
@ -1,23 +0,0 @@
|
||||
From 1600c6af7ed775d4ccbb239937acd92ef7162409 Mon Sep 17 00:00:00 2001
|
||||
From: Laurent Bigonville <bigon@bigon.be>
|
||||
Date: Sun, 9 Dec 2018 16:07:55 +0100
|
||||
Subject: [PATCH] Build with mozjs 60 instead
|
||||
|
||||
This seems enough to make it work with mozjs 60
|
||||
---
|
||||
libproxy/cmake/modules/pacrunner_mozjs.cmk | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libproxy/cmake/modules/pacrunner_mozjs.cmk b/libproxy/cmake/modules/pacrunner_mozjs.cmk
|
||||
index 20857fb..871cc85 100644
|
||||
--- a/libproxy/cmake/modules/pacrunner_mozjs.cmk
|
||||
+++ b/libproxy/cmake/modules/pacrunner_mozjs.cmk
|
||||
@@ -9,7 +9,7 @@ if(WIN32)
|
||||
elseif(NOT APPLE)
|
||||
option(WITH_MOZJS "Search for MOZJS package" ON)
|
||||
if (WITH_MOZJS)
|
||||
- pkg_search_module(MOZJS mozjs-52)
|
||||
+ pkg_search_module(MOZJS mozjs-60)
|
||||
if(MOZJS_FOUND)
|
||||
include_directories(${MOZJS_INCLUDE_DIRS})
|
||||
link_directories(${MOZJS_LIBRARY_DIRS})
|
||||
@ -1,180 +0,0 @@
|
||||
From 6c9e48accddb90eef8412bef3ccc29594935d3b3 Mon Sep 17 00:00:00 2001
|
||||
From: Iain Lane <iain@orangesquash.org.uk>
|
||||
Date: Wed, 11 Mar 2020 11:54:52 +0000
|
||||
Subject: [PATCH] mozjs: Port to mozjs 68
|
||||
|
||||
There are a number of API changes that need to be adapted to, notably
|
||||
|
||||
- JS_EncodeString is gone; need to use JS_EncodeStringToUTF8 now which
|
||||
requires a rooted object to be passed in.
|
||||
- JS_free is gone
|
||||
|
||||
The pkg-config file ships some flags which need to be supplied to the
|
||||
build.
|
||||
---
|
||||
libproxy/cmake/modules/pacrunner_mozjs.cmk | 6 ++-
|
||||
libproxy/modules/pacrunner_mozjs.cpp | 56 ++++++++++++++--------
|
||||
2 files changed, 41 insertions(+), 21 deletions(-)
|
||||
|
||||
diff --git a/libproxy/cmake/modules/pacrunner_mozjs.cmk b/libproxy/cmake/modules/pacrunner_mozjs.cmk
|
||||
index 871cc85..2cc3c51 100644
|
||||
--- a/libproxy/cmake/modules/pacrunner_mozjs.cmk
|
||||
+++ b/libproxy/cmake/modules/pacrunner_mozjs.cmk
|
||||
@@ -9,8 +9,12 @@ if(WIN32)
|
||||
elseif(NOT APPLE)
|
||||
option(WITH_MOZJS "Search for MOZJS package" ON)
|
||||
if (WITH_MOZJS)
|
||||
- pkg_search_module(MOZJS mozjs-60)
|
||||
+ pkg_search_module(MOZJS mozjs-68)
|
||||
if(MOZJS_FOUND)
|
||||
+ foreach(OPT ${MOZJS_CFLAGS})
|
||||
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OPT}")
|
||||
+ endforeach()
|
||||
+ message("mozjs is " ${CMAKE_CXX_FLAGS})
|
||||
include_directories(${MOZJS_INCLUDE_DIRS})
|
||||
link_directories(${MOZJS_LIBRARY_DIRS})
|
||||
else()
|
||||
diff --git a/libproxy/modules/pacrunner_mozjs.cpp b/libproxy/modules/pacrunner_mozjs.cpp
|
||||
index 38e7d46..37e1b42 100644
|
||||
--- a/libproxy/modules/pacrunner_mozjs.cpp
|
||||
+++ b/libproxy/modules/pacrunner_mozjs.cpp
|
||||
@@ -37,6 +37,9 @@ using namespace libproxy;
|
||||
#pragma GCC diagnostic error "-Winvalid-offsetof"
|
||||
#include <js/Initialization.h>
|
||||
#include <js/CallArgs.h>
|
||||
+#include <js/CompilationAndEvaluation.h>
|
||||
+#include <js/MemoryFunctions.h>
|
||||
+#include <js/SourceText.h>
|
||||
|
||||
#include "pacutils.h"
|
||||
|
||||
@@ -49,19 +52,21 @@ using namespace libproxy;
|
||||
#endif
|
||||
|
||||
static void dnsResolve_(JSContext *cx, JSString *hostname, JS::CallArgs *argv) {
|
||||
+ char *tmp;
|
||||
// Get hostname argument
|
||||
- char *tmp = JS_EncodeString(cx, hostname);
|
||||
+ JS::RootedString str(cx, hostname);
|
||||
+ JS::UniqueChars chars = JS_EncodeStringToUTF8(cx, str);
|
||||
+ const char *val = chars.get();
|
||||
|
||||
// Set the default return value
|
||||
argv->rval().setNull();
|
||||
|
||||
// Look it up
|
||||
struct addrinfo *info = nullptr;
|
||||
- if (getaddrinfo(tmp, NULL, NULL, &info))
|
||||
+ if (getaddrinfo(val, NULL, NULL, &info))
|
||||
goto out;
|
||||
|
||||
// Allocate the IP address
|
||||
- JS_free(cx, tmp);
|
||||
tmp = (char *) JS_malloc(cx, INET6_ADDRSTRLEN+1);
|
||||
memset(tmp, 0, INET6_ADDRSTRLEN+1);
|
||||
|
||||
@@ -77,7 +82,6 @@ static void dnsResolve_(JSContext *cx, JSString *hostname, JS::CallArgs *argv) {
|
||||
|
||||
out:
|
||||
if (info) freeaddrinfo(info);
|
||||
- JS_free(cx, tmp);
|
||||
}
|
||||
|
||||
static bool dnsResolve(JSContext *cx, unsigned argc, JS::Value *vp) {
|
||||
@@ -121,29 +125,40 @@ class mozjs_pacrunner : public pacrunner {
|
||||
if (!JS::InitSelfHostedCode(this->jsctx)) goto error;
|
||||
|
||||
JS::RootedValue rval(this->jsctx);
|
||||
- JS::CompartmentOptions compart_opts;
|
||||
+ JS::RealmOptions realm_opts;
|
||||
|
||||
this->jsglb = new JS::Heap<JSObject*>(JS_NewGlobalObject(
|
||||
this->jsctx, &cls,
|
||||
nullptr, JS::DontFireOnNewGlobalHook,
|
||||
- compart_opts));
|
||||
+ realm_opts));
|
||||
|
||||
if (!(this->jsglb)) goto error;
|
||||
JS::RootedObject global(this->jsctx,this->jsglb->get());
|
||||
- if (!(this->jsac = new JSAutoCompartment(this->jsctx, global))) goto error;
|
||||
- if (!JS_InitStandardClasses(this->jsctx, global)) goto error;
|
||||
+ if (!(this->jsar = new JSAutoRealm(this->jsctx, global))) goto error;
|
||||
|
||||
// Define Javascript functions
|
||||
JS_DefineFunction(this->jsctx, global, "dnsResolve", dnsResolve, 1, 0);
|
||||
JS_DefineFunction(this->jsctx, global, "myIpAddress", myIpAddress, 0, 0);
|
||||
JS::CompileOptions options(this->jsctx);
|
||||
- options.setUTF8(true);
|
||||
|
||||
- JS::Evaluate(this->jsctx, options, JAVASCRIPT_ROUTINES,
|
||||
- strlen(JAVASCRIPT_ROUTINES), JS::MutableHandleValue(&rval));
|
||||
+ JS::SourceText<mozilla::Utf8Unit> routines, pac_source;
|
||||
+ if (!routines.init(this->jsctx,
|
||||
+ JAVASCRIPT_ROUTINES,
|
||||
+ strlen(JAVASCRIPT_ROUTINES),
|
||||
+ JS::SourceOwnership::Borrowed))
|
||||
+ goto error;
|
||||
+
|
||||
+ if (!pac_source.init(this->jsctx,
|
||||
+ pac.c_str(),
|
||||
+ pac.length(),
|
||||
+ JS::SourceOwnership::Borrowed))
|
||||
+ goto error;
|
||||
+
|
||||
+
|
||||
+ JS::Evaluate(this->jsctx, options, routines, JS::MutableHandleValue(&rval));
|
||||
|
||||
// Add PAC to the environment
|
||||
- JS::Evaluate(this->jsctx, options, pac.c_str(), pac.length(), JS::MutableHandleValue(&rval));
|
||||
+ JS::Evaluate(this->jsctx, options, pac_source, JS::MutableHandleValue(&rval));
|
||||
return;
|
||||
}
|
||||
error:
|
||||
@@ -152,7 +167,7 @@ class mozjs_pacrunner : public pacrunner {
|
||||
}
|
||||
|
||||
~mozjs_pacrunner() {
|
||||
- if (this->jsac) delete this->jsac;
|
||||
+ if (this->jsar) delete this->jsar;
|
||||
if (this->jsglb) delete this->jsglb;
|
||||
if (this->jsctx) JS_DestroyContext(this->jsctx);
|
||||
JS_ShutDown();
|
||||
@@ -160,11 +175,9 @@ class mozjs_pacrunner : public pacrunner {
|
||||
|
||||
string run(const url& url_) throw (bad_alloc) {
|
||||
// Build arguments to the FindProxyForURL() function
|
||||
- char *tmpurl = JS_strdup(this->jsctx, url_.to_string().c_str());
|
||||
- char *tmphost = JS_strdup(this->jsctx, url_.get_host().c_str());
|
||||
+ const char *tmpurl = url_.to_string().c_str();
|
||||
+ const char *tmphost = url_.get_host().c_str();
|
||||
if (!tmpurl || !tmphost) {
|
||||
- if (tmpurl) JS_free(this->jsctx, tmpurl);
|
||||
- if (tmphost) JS_free(this->jsctx, tmphost);
|
||||
throw bad_alloc();
|
||||
}
|
||||
JS::AutoValueArray<2> args(this->jsctx);
|
||||
@@ -176,10 +189,13 @@ class mozjs_pacrunner : public pacrunner {
|
||||
JS::RootedObject global(this->jsctx,this->jsglb->get());
|
||||
bool result = JS_CallFunctionName(this->jsctx, global, "FindProxyForURL", args, &rval);
|
||||
if (!result) return "";
|
||||
+ if (!rval.isString())
|
||||
+ return "";
|
||||
|
||||
- char * tmpanswer = JS_EncodeString(this->jsctx, rval.toString());
|
||||
+ JS::RootedString s(this->jsctx, rval.toString());
|
||||
+ JS::UniqueChars chars = JS_EncodeStringToUTF8(this->jsctx, s);
|
||||
+ const char *tmpanswer = chars.get();
|
||||
string answer = string(tmpanswer);
|
||||
- JS_free(this->jsctx, tmpanswer);
|
||||
|
||||
if (answer == "undefined") return "";
|
||||
return answer;
|
||||
@@ -188,7 +204,7 @@ class mozjs_pacrunner : public pacrunner {
|
||||
private:
|
||||
JSContext *jsctx;
|
||||
JS::Heap<JSObject*> *jsglb;
|
||||
- JSAutoCompartment *jsac;
|
||||
+ JSAutoRealm *jsar;
|
||||
};
|
||||
|
||||
PX_PACRUNNER_MODULE_EZ(mozjs, "JS_DefineFunction", "mozjs");
|
||||
@ -1,26 +0,0 @@
|
||||
From 2d6da65598b90480b4a62c4633eda035ea51681f Mon Sep 17 00:00:00 2001
|
||||
From: David King <amigadave@amigadave.com>
|
||||
Date: Wed, 27 Jun 2018 06:36:00 +0100
|
||||
Subject: [PATCH] python: support Python 3.7 and 3.8
|
||||
|
||||
Add 3.7 and 3.8 to the list of accepted Python 3 versions.
|
||||
---
|
||||
cmake/FindPython3Interp.cmake | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/cmake/FindPython3Interp.cmake b/cmake/FindPython3Interp.cmake
|
||||
index c6cbe3d..8e5e409 100644
|
||||
--- a/cmake/FindPython3Interp.cmake
|
||||
+++ b/cmake/FindPython3Interp.cmake
|
||||
@@ -39,7 +39,7 @@
|
||||
|
||||
unset(_Python3_NAMES)
|
||||
|
||||
-set(_Python3_VERSIONS 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
|
||||
+set(_Python3_VERSIONS 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
|
||||
|
||||
if(Python3Interp_FIND_VERSION)
|
||||
if(Python3Interp_FIND_VERSION_COUNT GREATER 1)
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
From 869307ba7547cadef4a131581c3afdcaaec8c576 Mon Sep 17 00:00:00 2001
|
||||
From: David King <amigadave@amigadave.com>
|
||||
Date: Thu, 13 Feb 2020 12:24:17 +0000
|
||||
Subject: [PATCH] python: support Python 3.9
|
||||
|
||||
Add 3.9 to the list of accepted Python 3 versions.
|
||||
---
|
||||
cmake/FindPython3Interp.cmake | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/cmake/FindPython3Interp.cmake b/cmake/FindPython3Interp.cmake
|
||||
index 8e5e409..74398b2 100644
|
||||
--- a/cmake/FindPython3Interp.cmake
|
||||
+++ b/cmake/FindPython3Interp.cmake
|
||||
@@ -39,7 +39,7 @@
|
||||
|
||||
unset(_Python3_NAMES)
|
||||
|
||||
-set(_Python3_VERSIONS 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
|
||||
+set(_Python3_VERSIONS 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
|
||||
|
||||
if(Python3Interp_FIND_VERSION)
|
||||
if(Python3Interp_FIND_VERSION_COUNT GREATER 1)
|
||||
--
|
||||
2.24.1
|
||||
|
||||
Loading…
Reference in new issue