summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-07-24 10:38:48 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-07-24 10:38:48 +0000
commit1069e98a8cb2a1fc7a1752afc9f0980f965f8c77 (patch)
treef26b549ef60f58d9a42678ab2569ed51149fc9d2
parent0956a6f4da036d9c3eed1a23b78099d3cf0078c7 (diff)
merges r28688 from trunk into ruby_1_9_2.
-- * ext/socket/raddrinfo.c (rb_getaddrinfo): according to my valgrind output this variable should be initialized beforehand. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28745 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/socket/raddrinfo.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 6b1d062d81..f27c239324 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jul 20 12:42:06 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
+
+ * ext/socket/raddrinfo.c (rb_getaddrinfo): according to my
+ valgrind output this variable should be initialized beforehand.
+
Tue Jul 20 12:50:37 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (io_flush_buffer): write and buffer operations should be
diff --git a/ext/socket/raddrinfo.c b/ext/socket/raddrinfo.c
index 99426ed371..65b2b63927 100644
--- a/ext/socket/raddrinfo.c
+++ b/ext/socket/raddrinfo.c
@@ -152,6 +152,7 @@ rb_getaddrinfo(const char *node, const char *service,
#else
struct getaddrinfo_arg arg;
int ret;
+ MEMZERO(&arg, sizeof arg, 1);
arg.node = node;
arg.service = service;
arg.hints = hints;