From 40785d5342a31f9df3f9aa4c7fe4d05433ad601d Mon Sep 17 00:00:00 2001 From: shyouhei Date: Mon, 11 Aug 2008 00:36:08 +0000 Subject: merge revision(s) 17872: * ext/dl/dl.c (rb_str_to_ptr): should propagate taint to dlptr. * ext/dl/dl.c (rb_ary_to_ptr): ditto. * ext/dl/sym.c (rb_dlsym_call): should check taint of DLPtrData as well. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@18477 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/dl/dl.c | 14 +++++++++++--- ext/dl/sym.c | 1 + 2 files changed, 12 insertions(+), 3 deletions(-) (limited to 'ext') diff --git a/ext/dl/dl.c b/ext/dl/dl.c index 5ba3646ea3..88e954c668 100644 --- a/ext/dl/dl.c +++ b/ext/dl/dl.c @@ -522,12 +522,15 @@ rb_str_to_ptr(VALUE self) { char *ptr; int len; + VALUE p; len = RSTRING(self)->len; ptr = (char*)dlmalloc(len + 1); memcpy(ptr, RSTRING(self)->ptr, len); ptr[len] = '\0'; - return rb_dlptr_new((void*)ptr,len,dlfree); + p = rb_dlptr_new((void*)ptr,len,dlfree); + OBJ_INFECT(p, self); + return p; } VALUE @@ -545,7 +548,12 @@ rb_ary_to_ptr(int argc, VALUE argv[], VALUE self) ptr = rb_ary2cary(0, self, &size); break; } - return ptr ? rb_dlptr_new(ptr, size, dlfree) : Qnil; + if (ptr) { + VALUE p = rb_dlptr_new(ptr, size, dlfree); + OBJ_INFECT(p, self); + return p; + } + return Qnil; } VALUE @@ -563,7 +571,7 @@ rb_io_to_ptr(VALUE self) VALUE rb_dl_dlopen(int argc, VALUE argv[], VALUE self) { - rb_secure(4); + rb_secure(2); return rb_class_new_instance(argc, argv, rb_cDLHandle); } diff --git a/ext/dl/sym.c b/ext/dl/sym.c index 01e0474f58..933fb7f4f0 100644 --- a/ext/dl/sym.c +++ b/ext/dl/sym.c @@ -492,6 +492,7 @@ rb_dlsym_call(int argc, VALUE argv[], VALUE self) rb_raise(rb_eDLTypeError, "unexpected type of argument #%d", i); } } + rb_check_safe_obj(pval); Data_Get_Struct(pval, struct ptr_data, data); ANY2P(args[i]) = DLVOIDP(data->ptr); } -- cgit v1.2.3