From 3c93fd870b21f931d3f4aa7de89a18343339bd7f Mon Sep 17 00:00:00 2001 From: Madana Gopal Thirumalai Date: Mon, 9 Dec 2019 15:43:03 +0530 Subject: [PATCH 1/3] changes for preventing indirect process --- .../external/node-v10.15.3_mods.patch | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/examples/pxScene2d/external/node-v10.15.3_mods.patch b/examples/pxScene2d/external/node-v10.15.3_mods.patch index bd3fec4030..36a7908081 100644 --- a/examples/pxScene2d/external/node-v10.15.3_mods.patch +++ b/examples/pxScene2d/external/node-v10.15.3_mods.patch @@ -1151,3 +1151,47 @@ index f92446f..d02c098 100755 if (r != -1) return r; if (errno != ENOSYS) +diff --git a/examples/pxScene2d/external/libnode-v10.15.3/deps/v8/src/builtins/builtins-function.cc b/examples/pxScene2d/external/libnode-v10.15.3/deps/v8/src/builtins/builtins-function.cc +index df1dc19..d7d5bbf 100755 +--- a/examples/pxScene2d/external/libnode-v10.15.3/deps/v8/src/builtins/builtins-function.cc ++++ b/examples/pxScene2d/external/libnode-v10.15.3/deps/v8/src/builtins/builtins-function.cc +@@ -12,6 +12,12 @@ + #include "src/objects-inl.h" + #include "src/objects/api-callbacks.h" + #include "src/string-builder.h" ++/* MODIFIED CODE BEGIN */ ++#include "src/api.h" ++#include "src/handles.h" ++ ++using Utils = v8::Utils; ++/* MODIFIED CODE END */ + + namespace v8 { + namespace internal { +@@ -35,6 +41,10 @@ MaybeHandle CreateDynamicFunction(Isolate* isolate, + } + + // Build the source string. ++/* MODIFIED CODE BEGIN */ ++ v8::Local callingCtx = reinterpret_cast(isolate)->GetCallingContext(); ++ Handle callingCtxHandle = Utils::OpenHandle(*callingCtx); ++/* MODIFIED CODE END */ + Handle source; + int parameters_end_pos = kNoSourcePosition; + { +@@ -103,12 +113,14 @@ MaybeHandle CreateDynamicFunction(Isolate* isolate, + // come from here. + Handle function; + { ++/* MODIFIED CODE BEGIN */ + ASSIGN_RETURN_ON_EXCEPTION( + isolate, function, + Compiler::GetFunctionFromString( +- handle(target->native_context(), isolate), source, ++ handle(*callingCtxHandle, isolate), source, + ONLY_SINGLE_FUNCTION_LITERAL, parameters_end_pos), + Object); ++/* MODIFIED CODE END */ + Handle result; + ASSIGN_RETURN_ON_EXCEPTION( + isolate, result, From 6ab7fd30db0cc8d7b2d4f0ff02b1d57dd6ec5e12 Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Tue, 10 Dec 2019 10:09:37 +0530 Subject: [PATCH 2/3] Update test_imagecache.cpp --- tests/pxScene2d/test_imagecache.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/pxScene2d/test_imagecache.cpp b/tests/pxScene2d/test_imagecache.cpp index aee9c2a921..be31b7ec8f 100644 --- a/tests/pxScene2d/test_imagecache.cpp +++ b/tests/pxScene2d/test_imagecache.cpp @@ -46,7 +46,6 @@ limitations under the License. using namespace std; bool defaultCallbackExecuted = false; extern void startFileDownloadInBackground(void* data); -extern bool continueDownloadHandleCheck; // disabled as it causes crash // please note that realloc is also extensively @@ -834,7 +833,6 @@ class rtFileDownloaderTest : public testing::Test, public commonTestFns expectedStatusCode = 0; expectedHttpCode = 0; expectedCachePresence = false; - continueDownloadHandleCheck = false; } virtual void TearDown() From a43e5cda0c5b5ea46d4520aa9edb3db7a3a01306 Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Wed, 11 Dec 2019 19:47:09 +0530 Subject: [PATCH 3/3] Update test_imagecache.cpp --- tests/pxScene2d/test_imagecache.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/pxScene2d/test_imagecache.cpp b/tests/pxScene2d/test_imagecache.cpp index be31b7ec8f..d05a75cdd1 100644 --- a/tests/pxScene2d/test_imagecache.cpp +++ b/tests/pxScene2d/test_imagecache.cpp @@ -1,5 +1,4 @@ /* - pxCore Copyright 2005-2018 John Robinson Licensed under the Apache License, Version 2.0 (the "License");