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

Fixed readAllBuffer() to avoid adding garbage bytes at end.

Browse source 
The function readAllBuffer() always returned a string that was a
multiple of the BufSize in length, regardless of how many bytes were
actually read, padding the result with garbage bytes on the last chunk.
This fix properly trims the last chunk to its actual size.
This commit is contained in:
Reimer Behrends 2014-05-24 07:04:34 +02:00
commit ce773b70a7
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/system/sysio.nim
View file

@ -115,10 +115,14 @@ proc readAllBuffer(file: TFile): string =
# bytes we need to read before the buffer is empty. # bytes we need to read before the buffer is empty.
result = "" result = ""
var buffer = newString(BufSize) var buffer = newString(BufSize)
var bytesRead = BufSize while true:
while bytesRead == BufSize: var bytesRead = readBuffer(file, addr(buffer[0]), BufSize)
bytesRead = readBuffer(file, addr(buffer[0]), BufSize) if bytesRead == BufSize:
result.add(buffer) result.add(buffer)
else:
buffer.setLen(bytesRead)
result.add(buffer)
break
proc rawFileSize(file: TFile): int = proc rawFileSize(file: TFile): int =
# this does not raise an error opposed to `getFileSize` # this does not raise an error opposed to `getFileSize`