summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-05-27 11:07:57 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-05-27 11:07:57 +0000
commitaa37cc71279123d870263f9e9b315e7fd48095eb (patch)
treecfd4006c9bae86d3b25162636ac0abd24a226ac1
parent771240704854bd767f5873fa4199966f756f5b93 (diff)
* ext/socket/socket.c (sock_addrinfo): get rid of SEGV at NULL ptr
String. increase buffer size for 64bit platforms. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3871 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/socket/socket.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 08a4dfbdfd5..717b8c470ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue May 27 20:07:52 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
+
+ * ext/socket/socket.c (sock_addrinfo): get rid of SEGV at NULL ptr
+ String. increase buffer size for 64bit platforms.
+
Mon May 26 21:39:46 2003 MoonWolf <moonwolf@moonwolf.com>
* lib/mkmf.rb, lib/optparse.rb, lib/tracer.rb: use Method#to_block
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index 039d7b006b8..0198a8e1d66 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -553,7 +553,7 @@ sock_addrinfo(host, port, socktype, flags)
struct addrinfo hints, *hintsp, *res;
char *hostp, *portp;
int error;
- char hbuf[1024], pbuf[16];
+ char hbuf[1024], pbuf[32];
if (NIL_P(host)) {
hostp = NULL;
@@ -569,7 +569,7 @@ sock_addrinfo(host, port, socktype, flags)
SafeStringValue(host);
name = RSTRING(host)->ptr;
- if (*name == 0 || (name[0] == '<' && strcmp(name, "<any>") == 0)) {
+ if (!name || *name == 0 || (name[0] == '<' && strcmp(name, "<any>") == 0)) {
mkinetaddr(INADDR_ANY, hbuf, sizeof(hbuf));
}
else if (name[0] == '<' && strcmp(name, "<broadcast>") == 0) {