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

fixed #14839 (#14840)

Browse source
This commit is contained in:
lqdev 2020-06-28 13:38:57 +02:00 • committed by GitHub
commit 5d5271b789
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/pure/colors.nim
View file

@ -452,7 +452,7 @@ proc parseColor*(name: string): Color =
assert parseColor(b) == Color(0x01_79_fc) assert parseColor(b) == Color(0x01_79_fc)
doAssertRaises(ValueError): discard parseColor(c) doAssertRaises(ValueError): discard parseColor(c)
if name[0] == '#': if name.len > 0 and name[0] == '#':
result = Color(parseHexInt(name)) result = Color(parseHexInt(name))
else: else:
var idx = binarySearch(colorNames, name, colorNameCmp) var idx = binarySearch(colorNames, name, colorNameCmp)
@ -472,6 +472,7 @@ proc isColor*(name: string): bool =
assert b.isColor assert b.isColor
assert not c.isColor assert not c.isColor
if name.len == 0: return false
if name[0] == '#': if name[0] == '#':
for i in 1 .. name.len-1: for i in 1 .. name.len-1:
if name[i] notin {'0'..'9', 'a'..'f', 'A'..'F'}: return false if name[i] notin {'0'..'9', 'a'..'f', 'A'..'F'}: return false