mirror of
https://github.com/nim-lang/Nim.git
synced 2025-12-28 17:04:41 +00:00
fixes #21273; io.readLine off by one
This commit is contained in:
@@ -484,11 +484,12 @@ proc readLine*(f: File, line: var string): bool {.tags: [ReadIOEffect],
|
||||
if last > 0 and line[last-1] == '\c':
|
||||
line.setLen(last-1)
|
||||
return last > 1 or fgetsSuccess
|
||||
# We have to distinguish between two possible cases:
|
||||
elif last > 0 and line[last-1] == '\0':
|
||||
# We have to distinguish among three possible cases:
|
||||
# \0\l\0 => line ending in a null character.
|
||||
# \0\l\l => last line without newline, null was put there by fgets.
|
||||
elif last > 0 and line[last-1] == '\0':
|
||||
if last < pos + sp - 1 and line[last+1] != '\0':
|
||||
# \0\l => last line without newline, null was put there by fgets.
|
||||
if last >= pos + sp - 1 or line[last+1] != '\0': # bug #21273
|
||||
dec last
|
||||
line.setLen(last)
|
||||
return last > 0 or fgetsSuccess
|
||||
|
||||
@@ -36,3 +36,21 @@ block: # readChars
|
||||
break
|
||||
doAssert n2s == @[2,2,2,1,0]
|
||||
doAssert s2 == s
|
||||
|
||||
|
||||
import std/strutils
|
||||
|
||||
block: # bug #21273
|
||||
let FILE = buildDir / "D20220119T134305.txt"
|
||||
|
||||
let hex = "313632313920313632343720313632353920313632363020313632393020323035363520323037323120323131353020323239393820323331303520323332313020323332343820323332363820"
|
||||
|
||||
|
||||
writeFile FILE, parseHexStr(hex)
|
||||
|
||||
doAssert readFile(FILE).toHex == hex
|
||||
|
||||
let f = open(FILE)
|
||||
var s = newString(80)
|
||||
while f.readLine(s):
|
||||
doAssert s.toHex == hex
|
||||
|
||||
Reference in New Issue
Block a user