summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-05-20 07:01:19 +0000
committerocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-05-20 07:01:19 +0000
commita6d288e1585367cd6ded3fb4b30e002578080b68 (patch)
tree3ee8b46edf8dd2db7680bfa2935c1845b56aacca
parentbaf9c47b3fc09a2a4b43e67e4feb01208056fb81 (diff)
* ext/socket/socket.c: fix SEGV. [ruby-dev:23550]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@6375 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--ext/socket/socket.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e7ff5c7e38..5e3bfb1cff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu May 20 15:59:50 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+
+ * ext/socket/socket.c: fix SEGV. [ruby-dev:23550]
+
Thu May 20 14:35:52 2004 Tanaka Akira <akr@m17n.org>
* ext/socket/socket.c: check SCM_RIGHTS macro addition to
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index 0548a20016..88c6423695 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -1745,7 +1745,7 @@ setup_domain_and_type(domain, dv, type, tv)
char *ptr;
tmp = rb_check_string_type(domain);
- if (!NIL_P(domain)) {
+ if (!NIL_P(tmp)) {
domain = tmp;
rb_check_safe_obj(domain);
ptr = RSTRING(domain)->ptr;