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

critbits: don't rely on terminating zero

Browse source
This commit is contained in:
Andreas Rumpf 2018-04-29 07:42:47 +02:00
commit c8b2e65dbb
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/pure/collections/critbits.nim
View file

@ -74,8 +74,9 @@ proc rawInsert[T](c: var CritBitTree[T], key: string): Node[T] =
var newByte = 0 var newByte = 0
block blockX: block blockX:
while newbyte < key.len: while newbyte < key.len:
if newbyte >= it.key.len or it.key[newbyte] != key[newbyte]: let ch = if newbyte < it.key.len: it.key[newbyte] else: '\0'
newotherbits = it.key[newbyte].ord xor key[newbyte].ord if ch != key[newbyte]:
newotherbits = ch.ord xor key[newbyte].ord
break blockX break blockX
inc newbyte inc newbyte
if newbyte < it.key.len: if newbyte < it.key.len:
@ -85,7 +86,7 @@ proc rawInsert[T](c: var CritBitTree[T], key: string): Node[T] =
while (newOtherBits and (newOtherBits-1)) != 0: while (newOtherBits and (newOtherBits-1)) != 0:
newOtherBits = newOtherBits and (newOtherBits-1) newOtherBits = newOtherBits and (newOtherBits-1)
newOtherBits = newOtherBits xor 255 newOtherBits = newOtherBits xor 255
let ch = it.key[newByte] let ch = if newByte < it.key.len: it.key[newByte] else: '\0'
let dir = (1 + (ord(ch) or newOtherBits)) shr 8 let dir = (1 + (ord(ch) or newOtherBits)) shr 8
var inner: Node[T] var inner: Node[T]