From 170536b267edea4ab1c67a6fb93c4a4a723d5470 Mon Sep 17 00:00:00 2001 From: Ylian Saint-Hilaire Date: Tue, 26 Nov 2019 11:09:12 -0800 Subject: [PATCH 1/2] Fixed win-virtual-terminal for minification. --- microscript/ILibDuktape_Commit.h | 4 ++-- modules/win-virtual-terminal.js | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/microscript/ILibDuktape_Commit.h b/microscript/ILibDuktape_Commit.h index 25b54a4..b445da0 100644 --- a/microscript/ILibDuktape_Commit.h +++ b/microscript/ILibDuktape_Commit.h @@ -1,3 +1,3 @@ // This file is auto-generated, any edits may be overwritten -#define SOURCE_COMMIT_DATE "2019-May-12 21:39:02-0700" -#define SOURCE_COMMIT_HASH "d0fb36d10bc2bdf6822629daa098b07a90730e88" +#define SOURCE_COMMIT_DATE "2019-Nov-26 10:29:57-0800" +#define SOURCE_COMMIT_HASH "4222bb0294b912fd00c5dce233e0f424cf3eded5" diff --git a/modules/win-virtual-terminal.js b/modules/win-virtual-terminal.js index add9d04..c59bb97 100644 --- a/modules/win-virtual-terminal.js +++ b/modules/win-virtual-terminal.js @@ -14,9 +14,9 @@ See the License for the specific language governing permissions and limitations under the License. */ -const PROC_THREAD_ATTRIBUTE_PSEUDOCONSOLE = 0x00020016; -const EXTENDED_STARTUPINFO_PRESENT = 0x00080000; -const HEAP_ZERO_MEMORY = 0x00000008; +var PROC_THREAD_ATTRIBUTE_PSEUDOCONSOLE = 0x00020016; +var EXTENDED_STARTUPINFO_PRESENT = 0x00080000; +var HEAP_ZERO_MEMORY = 0x00000008; var duplex = require('stream').Duplex; From 29b21bcdefee90e464177e4ff37e0582fafa6537 Mon Sep 17 00:00:00 2001 From: Ylian Saint-Hilaire Date: Tue, 26 Nov 2019 14:53:31 -0800 Subject: [PATCH 2/2] Added Canary to HECI_IoctlHandler() --- microscript/ILibDuktape_Commit.h | 6 ++++-- microscript/ILibDuktape_HECI.c | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/microscript/ILibDuktape_Commit.h b/microscript/ILibDuktape_Commit.h index b445da0..52b85fe 100644 --- a/microscript/ILibDuktape_Commit.h +++ b/microscript/ILibDuktape_Commit.h @@ -1,3 +1,5 @@ // This file is auto-generated, any edits may be overwritten -#define SOURCE_COMMIT_DATE "2019-Nov-26 10:29:57-0800" -#define SOURCE_COMMIT_HASH "4222bb0294b912fd00c5dce233e0f424cf3eded5" +#define SOURCE_COMMIT_DATE "2019-Nov-26 11:09:12-0800" +#define SOURCE_COMMIT_DATE "2019-Nov-26 11:09:12-0800" +#define SOURCE_COMMIT_HASH "170536b267edea4ab1c67a6fb93c4a4a723d5470" +#define SOURCE_COMMIT_HASH "170536b267edea4ab1c67a6fb93c4a4a723d5470" diff --git a/microscript/ILibDuktape_HECI.c b/microscript/ILibDuktape_HECI.c index fd5f15c..0c0236f 100644 --- a/microscript/ILibDuktape_HECI.c +++ b/microscript/ILibDuktape_HECI.c @@ -795,6 +795,8 @@ void ILibDuktape_HECI_NextIoctl(ILibQueue q); BOOL ILibDuktape_HECI_IoctlHandler(HANDLE h, ILibWaitHandle_ErrorStatus errors, void *user) { if (errors == ILibWaitHandle_ErrorStatus_INVALID_HANDLE) { return(FALSE); } + if (!ILibMemory_CanaryOK(user)) { return(FALSE); } + ILibDuktape_HECI_ioctl_data *data = (ILibDuktape_HECI_ioctl_data*)user; ILibQueue Q = data->Q;