mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-01-02 19:22:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4680 from cheatfate/asyncwinsend

Browse Source 
async: protect data argument in windows send operation.
This commit is contained in:
Dominik Picheta
2016-09-02 18:21:35 +02:00
committed by GitHub
parent a5de03ea25 c5ffdd0389
commit 46948a9509
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/pure/asyncdispatch.nim
View File

@@ -827,14 +827,17 @@ when defined(windows) or defined(nimdoc):
var retFuture = newFuture[void]("send")
var dataBuf: TWSABuf
dataBuf.buf = data # since this is not used in a callback, this is fine
dataBuf.buf = data
dataBuf.len = data.len.ULONG
GC_ref(data) # we need to protect data until send operation is completed
# or failed.
var bytesReceived, lowFlags: Dword
var ol = PCustomOverlapped()
GC_ref(ol)
ol.data = CompletionData(fd: socket, cb:
proc (fd: AsyncFD, bytesCount: Dword, errcode: OSErrorCode) =
GC_unref(data) # if operation completed `data` must be released.
if not retFuture.finished:
if errcode == OSErrorCode(-1):
retFuture.complete()
@@ -851,6 +854,8 @@ when defined(windows) or defined(nimdoc):
let err = osLastError()
if err.int32 != ERROR_IO_PENDING:
GC_unref(ol)
GC_unref(data) # if operation failed `data` must be released, because
# completion routine will not be called.
if flags.isDisconnectionError(err):
retFuture.complete()
else:

7
lib/upcoming/asyncdispatch.nim
View File

@@ -796,14 +796,17 @@ when defined(windows) or defined(nimdoc):
var retFuture = newFuture[void]("send")
var dataBuf: TWSABuf
dataBuf.buf = data # since this is not used in a callback, this is fine
dataBuf.buf = data
dataBuf.len = data.len.ULONG
GC_ref(data) # we need to protect data until send operation is completed
# or failed.
var bytesReceived, lowFlags: Dword
var ol = PCustomOverlapped()
GC_ref(ol)
ol.data = CompletionData(fd: socket, cb:
proc (fd: AsyncFD, bytesCount: Dword, errcode: OSErrorCode) =
GC_unref(data) # if operation completed `data` must be released.
if not retFuture.finished:
if errcode == OSErrorCode(-1):
retFuture.complete()
@@ -820,6 +823,8 @@ when defined(windows) or defined(nimdoc):
let err = osLastError()
if err.int32 != ERROR_IO_PENDING:
GC_unref(ol)
GC_unref(data) # if operation failed `data` must be released, because
# completion routine will not be called.
if flags.isDisconnectionError(err):
retFuture.complete()
else: