status-im
/
NimYAML
mirror of https://github.com/status-im/NimYAML.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed a bug in uint deserialization. 

* fixes #123
This commit is contained in:
Felix Krause 2022-09-07 16:50:45 +02:00
parent 4ca3239e14
commit 7942e0a650
1 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
yaml/serialization.nim
View File

@ -183,16 +183,26 @@ proc parseOctal[T: int8|int16|int32|int64|uint8|uint16|uint32|uint64](
raise s.constructionError(mark, "Invalid character in hex: " & raise s.constructionError(mark, "Invalid character in hex: " &
escape("" & val[i])) escape("" & val[i]))
type NumberStyle = enum
nsHex
nsOctal
nsDecimal
proc numberStyle(item: Event): NumberStyle =
if item.scalarContent[0] == '0' and item.scalarContent.len > 1:
if item.scalarContent[1] in {'x', 'X' }: return nsHex
if item.scalarContent[1] in {'o', 'O'}: return nsOctal
return nsDecimal
proc constructObject*[T: int8|int16|int32|int64]( proc constructObject*[T: int8|int16|int32|int64](
s: var YamlStream, c: ConstructionContext, result: var T) s: var YamlStream, c: ConstructionContext, result: var T)
{.raises: [YamlConstructionError, YamlStreamError].} = {.raises: [YamlConstructionError, YamlStreamError].} =
## constructs an integer value from a YAML scalar ## constructs an integer value from a YAML scalar
constructScalarItem(s, item, T): constructScalarItem(s, item, T):
if item.scalarContent[0] == '0' and item.scalarContent.len > 1 and item.scalarContent[1] in {'x', 'X' }: case item.numberStyle
result = parseHex[T](s, item.startPos, item.scalarContent) of nsHex: result = parseHex[T](s, item.startPos, item.scalarContent)
elif item.scalarContent[0] == '0' and item.scalarContent.len > 1 and item.scalarContent[1] in {'o', 'O'}: of nsOctal: result = parseOctal[T](s, item.startPos, item.scalarContent)
result = parseOctal[T](s, item.startPos, item.scalarContent) of nsDecimal:
else:
let nInt = parseBiggestInt(item.scalarContent) let nInt = parseBiggestInt(item.scalarContent)
if nInt <= T.high: if nInt <= T.high:
# make sure we don't produce a range error # make sure we don't produce a range error
@ -238,11 +248,17 @@ proc constructObject*[T: DefiniteUIntTypes](
{.raises: [YamlConstructionError, YamlStreamError].} = {.raises: [YamlConstructionError, YamlStreamError].} =
## construct an unsigned integer value from a YAML scalar ## construct an unsigned integer value from a YAML scalar
constructScalarItem(s, item, T): constructScalarItem(s, item, T):
if item.scalarContent[0] == '0' and item.scalarContent[1] in {'x', 'X'}: case item.numberStyle
result = parseHex[T](s, item.startPos, item.scalarContent) of nsHex: result = parseHex[T](s, item.startPos, item.scalarContent)
elif item.scalarContent[0] == '0' and item.scalarContent[1] in {'o', 'O'}: of nsOctal: result = parseOctal[T](s, item.startPos, item.scalarContent)
result = parseOctal[T](s, item.startPos, item.scalarContent) else:
else: result = T(parseBiggestUInt(item.scalarContent)) let nUInt = parseBiggestUInt(item.scalarContent)
if nUInt <= T.high:
# make sure we don't produce a range error
result = T(nUInt)
else:
raise s.constructionError(item.startPos, "Cannot construct uint; out of range: " &
$nUInt & " for type " & T.name & " with max of: " & $T.high)
proc constructObject*(s: var YamlStream, c: ConstructionContext, proc constructObject*(s: var YamlStream, c: ConstructionContext,
result: var uint) result: var uint)