diff options
| -rw-r--r-- | lib/pure/encodings.nim | 2 | ||||
| -rw-r--r-- | lib/pure/ospaths.nim | 2 | ||||
| -rw-r--r-- | tests/concepts/tstackconcept.nim | 2 | ||||
| -rw-r--r-- | tests/stdlib/twchartoutf8.nim | 1 | ||||
| -rw-r--r-- | tests/vm/tcompiletimetable.nim | 1 |
5 files changed, 3 insertions, 5 deletions
diff --git a/lib/pure/encodings.nim b/lib/pure/encodings.nim index 5840d443d..731fbbc29 100644 --- a/lib/pure/encodings.nim +++ b/lib/pure/encodings.nim @@ -36,7 +36,7 @@ when defined(windows): while i < a.len and j < b.len: if a[i] in {'-', '_'}: inc i if b[j] in {'-', '_'}: inc j - if a[i].toLower != b[j].toLower: return false + if i < a.len and j < b.len and a[i].toLowerAscii != b[j].toLowerAscii: return false inc i inc j result = i == a.len and j == b.len diff --git a/lib/pure/ospaths.nim b/lib/pure/ospaths.nim index aeb4a149e..ee2b715d3 100644 --- a/lib/pure/ospaths.nim +++ b/lib/pure/ospaths.nim @@ -477,7 +477,7 @@ proc unixToNativePath*(path: string, drive=""): string {. var i = start while i < len(path): # ../../../ --> :::: - if path[i] == '.' and path[i+1] == '.' and path[i+2] == '/': + if i+2 < path.len and path[i] == '.' and path[i+1] == '.' and path[i+2] == '/': # parent directory when defined(macos): if result[high(result)] == ':': diff --git a/tests/concepts/tstackconcept.nim b/tests/concepts/tstackconcept.nim index 2238dacb6..cb8db566d 100644 --- a/tests/concepts/tstackconcept.nim +++ b/tests/concepts/tstackconcept.nim @@ -31,7 +31,7 @@ type s.pop() is T type ValueType = T - const ValueTypeName = T.name.toUpper + const ValueTypeName = T.name.toUpperAscii proc genericAlgorithm[T](s: var Stack[T], y: T) = static: diff --git a/tests/stdlib/twchartoutf8.nim b/tests/stdlib/twchartoutf8.nim index b2f68ee32..a6602e3e3 100644 --- a/tests/stdlib/twchartoutf8.nim +++ b/tests/stdlib/twchartoutf8.nim @@ -30,7 +30,6 @@ else: result = newString(size) let res = WideCharToMultiByte(CP_UTF8, 0'i32, cast[LPWCSTR](addr(wc[0])), wclen, cstring(result), size, cstring(nil), LPBOOL(nil)) - result[size] = chr(0) doAssert size == res proc testCP(wc: WideCString, lo, hi: int) = diff --git a/tests/vm/tcompiletimetable.nim b/tests/vm/tcompiletimetable.nim index b5b84a790..e78c06536 100644 --- a/tests/vm/tcompiletimetable.nim +++ b/tests/vm/tcompiletimetable.nim @@ -4,7 +4,6 @@ discard """ 4:2 Got Hi Got Hey''' - disabled: "true" """ # bug #404 |