jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Guard against null exception (#10162)

Browse source
This commit is contained in:
rec 2019-01-04 15:05:03 +01:00 • committed by Andreas Rumpf
commit ba7d33b4e4
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/system/jssys.nim
View file

@ -46,7 +46,7 @@ proc nimCharToStr(x: char): string {.compilerproc.} =
result[0] = x result[0] = x
proc isNimException(): bool {.asmNoStackFrame.} = proc isNimException(): bool {.asmNoStackFrame.} =
asm "return `lastJSError`.m_type;" asm "return `lastJSError` && `lastJSError`.m_type;"
proc getCurrentException*(): ref Exception {.compilerRtl, benign.} = proc getCurrentException*(): ref Exception {.compilerRtl, benign.} =
if isNimException(): result = cast[ref Exception](lastJSError) if isNimException(): result = cast[ref Exception](lastJSError)

3
tests/js/test2.nim
View file

@ -9,6 +9,9 @@ js 3.14
# This file tests the JavaScript generator # This file tests the JavaScript generator
doAssert getCurrentException() == nil
doAssert getCurrentExceptionMsg() == ""
# #335 # #335
proc foo() = proc foo() =
var bar = "foo" var bar = "foo"