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

Don't crash if GC_{un,}ref is called on nil (#9445)

Browse source 
Fixes #9442
This commit is contained in:
LemonBoy 2018-10-22 17:09:15 +02:00 • committed by Andreas Rumpf
commit b613092de8
2 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/ccgexprs.nim
View file

@ -2008,8 +2008,8 @@ proc genMagicExpr(p: BProc, e: PNode, d: var TLoc, op: TMagic) =
frmt = "$1 = $2->len;$n" frmt = "$1 = $2->len;$n"
lineCg(p, cpsStmts, frmt, tmp.r, rdLoc(a)) lineCg(p, cpsStmts, frmt, tmp.r, rdLoc(a))
putIntoDest(p, d, e, tmp.r) putIntoDest(p, d, e, tmp.r)
of mGCref: unaryStmt(p, e, d, "#nimGCref($1);$n") of mGCref: unaryStmt(p, e, d, "if ($1) { #nimGCref($1); }$n")
of mGCunref: unaryStmt(p, e, d, "#nimGCunref($1);$n") of mGCunref: unaryStmt(p, e, d, "if ($1) { #nimGCunref($1); }$n")
of mSetLengthStr: genSetLengthStr(p, e, d) of mSetLengthStr: genSetLengthStr(p, e, d)
of mSetLengthSeq: genSetLengthSeq(p, e, d) of mSetLengthSeq: genSetLengthSeq(p, e, d)
of mIncl, mExcl, mCard, mLtSet, mLeSet, mEqSet, mMulSet, mPlusSet, mMinusSet, of mIncl, mExcl, mCard, mLtSet, mLeSet, mEqSet, mMulSet, mPlusSet, mMinusSet,

11
tests/magics/tmagics.nim
View file

@ -43,3 +43,14 @@ block t8693:
doAssert bar(Foo, Foo) doAssert bar(Foo, Foo)
doAssert bar(any, Foo) doAssert bar(any, Foo)
doAssert bar(Foo, any) == false doAssert bar(Foo, any) == false
block t9442:
var v1: ref char
var v2: string
var v3: seq[char]
GC_ref(v1)
GC_unref(v1)
GC_ref(v2)
GC_unref(v2)
GC_ref(v3)
GC_unref(v3)