summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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;