summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-12-21 23:35:11 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-12-21 23:35:11 +0000
commitbf48e2286965c53e1d083113c7d2b4d4eb9a0f13 (patch)
tree676343b4c9954419be5d5f8e3567301949cfa74d
parente537aaba91ac5ad8a554b155afbcc2d0efb50f66 (diff)
* ext/dl/sym.c (rb_dlsym_initialize): extract internal pointers after
all argument conversion. fixed: [ruby-dev:25271] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7631 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/dl/sym.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f8cde729b4..87ecabc46f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Dec 22 08:34:32 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/dl/sym.c (rb_dlsym_initialize): extract internal pointers after
+ all argument conversion. fixed: [ruby-dev:25271]
+
Tue Dec 21 16:15:21 2004 Michael Neumann <mneumann@ruby-lang.org>
* lib/xmlrpc/client.rb: use "" instead of "." if prefix argument is
diff --git a/ext/dl/sym.c b/ext/dl/sym.c
index 751b2be39f..7151d3c04e 100644
--- a/ext/dl/sym.c
+++ b/ext/dl/sym.c
@@ -154,8 +154,9 @@ rb_dlsym_initialize(int argc, VALUE argv[], VALUE self)
rb_scan_args(argc, argv, "12", &addr, &name, &type);
saddr = (void*)(DLNUM2LONG(rb_Integer(addr)));
- sname = NIL_P(name) ? NULL : StringValuePtr(name);
+ if (!NIL_P(name)) StringValue(name);
stype = NIL_P(type) ? NULL : StringValuePtr(type);
+ sname = NIL_P(name) ? NULL : RSTRING(name)->ptr;
if( saddr ){
Data_Get_Struct(self, struct sym_data, data);