From 1921fbce45fc87ca7932b11881a5714ae12b5d0c Mon Sep 17 00:00:00 2001 From: usa Date: Tue, 18 Jul 2006 14:13:07 +0000 Subject: [PATCH] * win32/win32.c (open_ifs_socket): should not use plain malloc. * win32/win32.c (rb_w32_opendir): should not use plain realloc. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10562 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ win32/win32.c | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d9e68459d6..11913b544c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Jul 18 23:10:43 2006 NAKAMURA Usaku + + * win32/win32.c (open_ifs_socket): should not use plain malloc. + + * win32/win32.c (rb_w32_opendir): should not use plain realloc. + Tue Jul 18 16:52:29 2006 Yukihiro Matsumoto * eval.c (yield_under_i): argument should be passed in avalue diff --git a/win32/win32.c b/win32/win32.c index b780da07f1..01378ffe2a 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -1462,7 +1462,7 @@ rb_w32_opendir(const char *filename) // new name and it's null terminator // - #define Renew(x, y, z) (x = (z *)realloc(x, y)) + #define Renew(x, y, z) (x = (z *)xrealloc(x, y)) Renew (p->start, idx+len+1, char); if (p->start == NULL) { @@ -2486,6 +2486,10 @@ open_ifs_socket(int af, int type, int protocol) int protocols_available = 0; proto_buffers = (WSAPROTOCOL_INFO *)malloc(proto_buffers_len); + if (!proto_buffers) { + WSASetLastError(WSA_NOT_ENOUGH_MEMORY); + return INVALID_SOCKET; + } protocols_available = WSAEnumProtocols(NULL, proto_buffers, &proto_buffers_len);