From 5e4e35899029c91597ac78eb27be488fdcd7f69b Mon Sep 17 00:00:00 2001 From: bptato Date: Wed, 20 Dec 2023 23:34:05 +0100 Subject: js: fix nil deref in jsgetprop Turns out desc can in fact be nil. --- src/js/javascript.nim | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'src/js') diff --git a/src/js/javascript.nim b/src/js/javascript.nim index 8f7f445c..78999668 100644 --- a/src/js/javascript.nim +++ b/src/js/javascript.nim @@ -946,10 +946,15 @@ macro jsgetprop*(fun: typed) = block `dl`: let retv = ctx.toJS(`jfcl`) if retv != JS_NULL: - desc[].setter = JS_UNDEFINED - desc[].getter = JS_UNDEFINED - desc[].value = retv - desc[].flags = 0 + if desc != nil: + # From quickjs.h: + # > If 1 is returned, the property descriptor 'desc' is filled + # > if != NULL. + # So desc may be nil. + desc[].setter = JS_UNDEFINED + desc[].getter = JS_UNDEFINED + desc[].value = retv + desc[].flags = 0 return cint(1) return cint(0) let jsProc = gen.newJSProc(getJSGetPropParams(), false) -- cgit 1.4.1-2-gfad0