Gabriel Ivăncescu : jscript: Don't allow construction on builtin methods.

Alexandre Julliard julliard at winehq.org
Fri Jun 3 15:53:09 CDT 2022


Module: wine
Branch: master
Commit: 738e306bf72fface4a813f2a990e7d6eed310373
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=738e306bf72fface4a813f2a990e7d6eed310373

Author: Gabriel Ivăncescu <gabrielopcode at gmail.com>
Date:   Thu Jun  2 20:00:48 2022 +0300

jscript: Don't allow construction on builtin methods.

Signed-off-by: Gabriel Ivăncescu <gabrielopcode at gmail.com>
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/jscript/function.c   | 2 ++
 dlls/jscript/tests/api.js | 1 +
 2 files changed, 3 insertions(+)

diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c
index 984eebf4270..bf152e22868 100644
--- a/dlls/jscript/function.c
+++ b/dlls/jscript/function.c
@@ -619,6 +619,8 @@ static HRESULT NativeFunction_call(script_ctx_t *ctx, FunctionInstance *func, js
 {
     NativeFunction *function = (NativeFunction*)func;
 
+    if((flags & DISPATCH_CONSTRUCT) && !(function->function.flags & PROPF_CONSTR))
+        return JS_E_INVALID_ACTION;
     return function->proc(ctx, vthis, flags & ~DISPATCH_JSCRIPT_INTERNAL_MASK, argc, argv, r);
 }
 
diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js
index 1368f399b50..123665cfdde 100644
--- a/dlls/jscript/tests/api.js
+++ b/dlls/jscript/tests/api.js
@@ -2622,6 +2622,7 @@ testException(function() {"test" in nullDisp;}, "E_OBJECT_EXPECTED");
 testException(function() {new 3;}, "E_UNSUPPORTED_ACTION");
 testException(function() {new null;}, "E_OBJECT_EXPECTED");
 testException(function() {new nullDisp;}, "E_NO_PROPERTY");
+testException(function() {new Math.max(5);}, "E_UNSUPPORTED_ACTION");
 testException(function() {new VBArray();}, "E_NOT_VBARRAY");
 testException(function() {new VBArray(new VBArray(createArray()));}, "E_NOT_VBARRAY");
 testException(function() {VBArray.prototype.lbound.call(new Object());}, "E_NOT_VBARRAY");




More information about the wine-cvs mailing list