diff options
| author | Xavier Leroy <xavierleroy@users.noreply.github.com> | 2017-10-09 19:20:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-09 19:20:46 +0200 |
| commit | 019f469aa36c65d5436c0cc107aff310aa399735 (patch) | |
| tree | 750144b65aa044dd0fdb533d5573247d82d5f8d6 | |
| parent | 875ff82841be20e2d1faefba995c8fc744809933 (diff) | |
| download | ocaml-019f469aa36c65d5436c0cc107aff310aa399735.tar.gz | |
MPR#7609: use-after-free with ocamldebug and Pervasives.flush_all, continued (GPR#1419)
This is a follow-up to commit 6d9ce26 and to GPR #1361.
I forgot that the win_{in,out}channel_of_filedescr functions from the
Win32 implementation of the Unix library call caml_open_descriptor_{in,out}
directly, without going through caml_ml_open_descriptor_{in,out} like
the Unix implementation of the Unix library does.
As a consequence the CHANNEL_FLAG_MANAGED_BY_GC flag is not set by
the Win32 implementation.
This commit fixes the Win32 implementation and brings it in sync with
the Unix implementation by setting the CHANNEL_FLAG_MANAGED_BY_GC
flag.
| -rw-r--r-- | otherlibs/win32unix/channels.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/otherlibs/win32unix/channels.c b/otherlibs/win32unix/channels.c index 0347bd38a8..2749a766bd 100644 --- a/otherlibs/win32unix/channels.c +++ b/otherlibs/win32unix/channels.c @@ -50,6 +50,8 @@ CAMLprim value win_inchannel_of_filedescr(value handle) fflush(stdin); #endif chan = caml_open_descriptor_in(win_CRT_fd_of_filedescr(handle)); + chan->flags |= CHANNEL_FLAG_MANAGED_BY_GC; + /* as in caml_ml_open_descriptor_in() */ if (Descr_kind_val(handle) == KIND_SOCKET) chan->flags |= CHANNEL_FLAG_FROM_SOCKET; vchan = caml_alloc_channel(chan); @@ -64,6 +66,8 @@ CAMLprim value win_outchannel_of_filedescr(value handle) struct channel * chan; chan = caml_open_descriptor_out(win_CRT_fd_of_filedescr(handle)); + chan->flags |= CHANNEL_FLAG_MANAGED_BY_GC; + /* as in caml_ml_open_descriptor_out() */ if (Descr_kind_val(handle) == KIND_SOCKET) chan->flags |= CHANNEL_FLAG_FROM_SOCKET; vchan = caml_alloc_channel(chan); |