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

fix the ftp store function read the local file bug (#13108) [backport]

Browse source 
* Update asyncftpclient.nim

When use newStringOfCap function not have assign memory for the string data,so if use this address the fault is rasise.

* complelete the bugfix
This commit is contained in:
perter lee 2020-01-13 17:16:19 +08:00 • committed by Andreas Rumpf
commit 1f27a2f8ab
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/pure/asyncftpclient.nim
View file

@ -351,15 +351,13 @@ proc doUpload(ftp: AsyncFtpClient, file: File,
assert ftp.dsockConnected assert ftp.dsockConnected
let total = file.getFileSize() let total = file.getFileSize()
var data = newStringOfCap(4000) var data = newString(4000)
var progress = 0 var progress = 0
var progressInSecond = 0 var progressInSecond = 0
var countdownFut = sleepAsync(1000) var countdownFut = sleepAsync(1000)
var sendFut: Future[void] = nil var sendFut: Future[void] = nil
while ftp.dsockConnected: while ftp.dsockConnected:
if sendFut == nil or sendFut.finished: if sendFut == nil or sendFut.finished:
progress.inc(data.len)
progressInSecond.inc(data.len)
# TODO: Async file reading. # TODO: Async file reading.
let len = file.readBuffer(addr(data[0]), 4000) let len = file.readBuffer(addr(data[0]), 4000)
setLen(data, len) setLen(data, len)
@ -370,6 +368,8 @@ proc doUpload(ftp: AsyncFtpClient, file: File,
assertReply(await(ftp.expectReply()), "226") assertReply(await(ftp.expectReply()), "226")
else: else:
progress.inc(len)
progressInSecond.inc(len)
sendFut = ftp.dsock.send(data) sendFut = ftp.dsock.send(data)
if countdownFut.finished: if countdownFut.finished: