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

Protect data argument for GC.

Browse source
This commit is contained in:
cheatfate 2016-08-30 23:15:08 +03:00
commit c5ffdd0389
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 retFuture = newFuture[void]("send")
var dataBuf: TWSABuf 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 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 bytesReceived, lowFlags: Dword
var ol = PCustomOverlapped() var ol = PCustomOverlapped()
GC_ref(ol) GC_ref(ol)
ol.data = CompletionData(fd: socket, cb: ol.data = CompletionData(fd: socket, cb:
proc (fd: AsyncFD, bytesCount: Dword, errcode: OSErrorCode) = proc (fd: AsyncFD, bytesCount: Dword, errcode: OSErrorCode) =
GC_unref(data) # if operation completed `data` must be released.
if not retFuture.finished: if not retFuture.finished:
if errcode == OSErrorCode(-1): if errcode == OSErrorCode(-1):
retFuture.complete() retFuture.complete()
@ -851,6 +854,8 @@ when defined(windows) or defined(nimdoc):
let err = osLastError() let err = osLastError()
if err.int32 != ERROR_IO_PENDING: if err.int32 != ERROR_IO_PENDING:
GC_unref(ol) GC_unref(ol)
GC_unref(data) # if operation failed `data` must be released, because
# completion routine will not be called.
if flags.isDisconnectionError(err): if flags.isDisconnectionError(err):
retFuture.complete() retFuture.complete()
else: else:

7
lib/upcoming/asyncdispatch.nim
View file

@ -796,14 +796,17 @@ when defined(windows) or defined(nimdoc):
var retFuture = newFuture[void]("send") var retFuture = newFuture[void]("send")
var dataBuf: TWSABuf 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 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 bytesReceived, lowFlags: Dword
var ol = PCustomOverlapped() var ol = PCustomOverlapped()
GC_ref(ol) GC_ref(ol)
ol.data = CompletionData(fd: socket, cb: ol.data = CompletionData(fd: socket, cb:
proc (fd: AsyncFD, bytesCount: Dword, errcode: OSErrorCode) = proc (fd: AsyncFD, bytesCount: Dword, errcode: OSErrorCode) =
GC_unref(data) # if operation completed `data` must be released.
if not retFuture.finished: if not retFuture.finished:
if errcode == OSErrorCode(-1): if errcode == OSErrorCode(-1):
retFuture.complete() retFuture.complete()
@ -820,6 +823,8 @@ when defined(windows) or defined(nimdoc):
let err = osLastError() let err = osLastError()
if err.int32 != ERROR_IO_PENDING: if err.int32 != ERROR_IO_PENDING:
GC_unref(ol) GC_unref(ol)
GC_unref(data) # if operation failed `data` must be released, because
# completion routine will not be called.
if flags.isDisconnectionError(err): if flags.isDisconnectionError(err):
retFuture.complete() retFuture.complete()
else: else: