From 5c8332d8715107e9735ef87cd95f2b4d1f95f4e7 Mon Sep 17 00:00:00 2001 From: Andreas Rumpf Date: Mon, 5 Mar 2018 19:45:59 +0100 Subject: fixes #7293 --- lib/pure/strutils.nim | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/pure/strutils.nim b/lib/pure/strutils.nim index 2ad006001..749a2696d 100644 --- a/lib/pure/strutils.nim +++ b/lib/pure/strutils.nim @@ -2295,7 +2295,7 @@ proc addf*(s: var string, formatstr: string, a: varargs[string, `$`]) {. case formatstr[i+1] # again we use the fact that strings # are zero-terminated here of '#': - if num >% a.high: invalidFormatString() + if num > a.high: invalidFormatString() add s, a[num] inc i, 2 inc num @@ -2311,7 +2311,7 @@ proc addf*(s: var string, formatstr: string, a: varargs[string, `$`]) {. j = j * 10 + ord(formatstr[i]) - ord('0') inc(i) let idx = if not negative: j-1 else: a.len-j - if idx >% a.high: invalidFormatString() + if idx < 0 or idx > a.high: invalidFormatString() add s, a[idx] of '{': var j = i+2 @@ -2328,7 +2328,7 @@ proc addf*(s: var string, formatstr: string, a: varargs[string, `$`]) {. inc(j) if isNumber == 1: let idx = if not negative: k-1 else: a.len-k - if idx >% a.high: invalidFormatString() + if idx < 0 or idx > a.high: invalidFormatString() add s, a[idx] else: var x = findNormalized(substr(formatstr, i+2, j-1), a) -- cgit 1.4.1-2-gfad0 adg.nim?h=devel&id=4d3846e26b38ddf7fade05489f0f3335db057950'>commit diff stats

path: root/tests/rodfiles/deadg.nim

blob: 97bfbed4f7803a1aca6d8134c8f020d1c9330c38 (plain) (blame)