Piotr Caban : msvcrt: Don' t use MSVCRT_fdend in msvcrt_create_io_inherit_block.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Jun 11 09:46:11 CDT 2015
Module: wine
Branch: master
Commit: e7fc237088552965169dbd573b8dd895bac1d82a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7fc237088552965169dbd573b8dd895bac1d82a
Author: Piotr Caban <piotr at codeweavers.com>
Date: Wed Jun 10 17:48:33 2015 +0200
msvcrt: Don't use MSVCRT_fdend in msvcrt_create_io_inherit_block.
---
dlls/msvcrt/file.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c
index 161219b..36887fc 100644
--- a/dlls/msvcrt/file.c
+++ b/dlls/msvcrt/file.c
@@ -548,12 +548,17 @@ static int msvcrt_init_fp(MSVCRT_FILE* file, int fd, unsigned stream_flags)
*/
unsigned msvcrt_create_io_inherit_block(WORD *size, BYTE **block)
{
- int fd;
+ int fd, last_fd;
char* wxflag_ptr;
HANDLE* handle_ptr;
ioinfo* fdinfo;
- *size = sizeof(unsigned) + (sizeof(char) + sizeof(HANDLE)) * MSVCRT_fdend;
+ for (last_fd=MSVCRT_MAX_FILES-1; last_fd>=0; last_fd--)
+ if (get_ioinfo_nolock(last_fd)->handle != INVALID_HANDLE_VALUE)
+ break;
+ last_fd++;
+
+ *size = sizeof(unsigned) + (sizeof(char) + sizeof(HANDLE)) * last_fd;
*block = MSVCRT_calloc(*size, 1);
if (!*block)
{
@@ -561,10 +566,10 @@ unsigned msvcrt_create_io_inherit_block(WORD *size, BYTE **block)
return FALSE;
}
wxflag_ptr = (char*)*block + sizeof(unsigned);
- handle_ptr = (HANDLE*)(wxflag_ptr + MSVCRT_fdend * sizeof(char));
+ handle_ptr = (HANDLE*)(wxflag_ptr + last_fd);
- *(unsigned*)*block = MSVCRT_fdend;
- for (fd = 0; fd < MSVCRT_fdend; fd++)
+ *(unsigned*)*block = last_fd;
+ for (fd = 0; fd < last_fd; fd++)
{
/* to be inherited, we need it to be open, and that DONTINHERIT isn't set */
fdinfo = get_ioinfo(fd);
More information about the wine-cvs
mailing list