From 12098a52505520c5b006ab24fbd87c7e78579386 Mon Sep 17 00:00:00 2001 From: hackx2 <80620538+hackx2@users.noreply.github.com> Date: Thu, 19 Nov 2026 19:40:54 +0000 Subject: [PATCH] prevent bypass accessor from leaking I'll go more in-depth in my pr. + bypass accessor tests --- TestHScript.hx | 19 +++++++++++++++++++ hscript/Interp.hx | 7 ++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/TestHScript.hx b/TestHScript.hx index 4ab68869..68bba3a9 100644 --- a/TestHScript.hx +++ b/TestHScript.hx @@ -381,6 +381,15 @@ class TestHScript extends TestCase { assertScript('var r = ~/Hello your Computer has ([0-9]+) virus/; r.match(str); r.matched(1)', "10", {str: "Hello your Computer has 10 virus"}, false, true); } + function testBypassAccessor() { + final vars = {"BypassAccessor": TestBypassAccessor}; + assertScript('var a = new BypassAccessor(); @:bypassAccessor { a.a = "hii"; } a.amt', 0, vars); + assertScript('var a = new BypassAccessor(); a.a = "hii"; a.amt', 1, vars); + + assertScript('function a() { @:bypassAccessor { return 1; }} a(); var b = new BypassAccessor(); b.a = "c"; b.amt', 1, vars); + assertScript('while (true) { @:bypassAccessor { break; }} var b = new BypassAccessor(); b.a = "c"; b.amt', 1, vars); + } + static function main() { #if ((haxe_ver < 4) && php) // uncaught exception: The each() function is deprecated. This message will be suppressed on further calls (errno: 8192) @@ -417,4 +426,14 @@ class TestClass { public function getSum() { return a + b; } +} + +class TestBypassAccessor { + public var a(default, set):String = ""; + public var amt = 0; + function set_a(v) { + amt++; + return a = v; + } + function new() {} } \ No newline at end of file diff --git a/hscript/Interp.hx b/hscript/Interp.hx index 2faf19f0..71007a8a 100644 --- a/hscript/Interp.hx +++ b/hscript/Interp.hx @@ -1597,7 +1597,12 @@ class Interp { case ":bypassAccessor": final oldAccessor:Bool = isBypassAccessor; isBypassAccessor = true; - val = expr(e); + try { + val = expr(e); + } catch(e){ + isBypassAccessor = oldAccessor; + rethrow(e); + } isBypassAccessor = oldAccessor; default: val = expr(e);