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

fixes a critical tables bug that caused 'enlarge' to crash after 'add'

Browse source
This commit is contained in:
Andreas Rumpf 2016-09-05 08:51:38 +02:00
commit 4077050a42
3 changed files with 30 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/pure/collections/tables.nim
View file

@ -270,9 +270,12 @@ proc enlarge[A, B](t: var Table[A, B]) =
newSeq(n, len(t.data) * growthFactor)
swap(t.data, n)
for i in countup(0, high(n)):
if isFilled(n[i].hcode):
var j = -1 - rawGetKnownHC(t, n[i].key, n[i].hcode)
rawInsert(t, t.data, n[i].key, n[i].val, n[i].hcode, j)
let eh = n[i].hcode
if isFilled(eh):
var j: Hash = eh and maxHash(t)
while isFilled(t.data[j].hcode):
j = nextTry(j, maxHash(t))
rawInsert(t, t.data, n[i].key, n[i].val, eh, j)
proc mgetOrPut*[A, B](t: var Table[A, B], key: A, val: B): var B =
## retrieves value at ``t[key]`` or puts ``val`` if not present, either way