diff options
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | ext/dl/handle.c | 11 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 10 insertions, 5 deletions
@@ -5,7 +5,7 @@ Wed Dec 16 21:10:03 2015 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org> * test/fiddle/test_handle.rb (class TestHandle): add test for above. -Wed Dec 16 21:10:36 2015 Yuki Sonoda (Yugui) <yugui@yugui.jp> +Wed Dec 16 21:10:03 2015 Yuki Sonoda (Yugui) <yugui@yugui.jp> * ext/dl/handle.c (rb_dlhandle_initialize): prohibits DL::dlopen with a tainted name of library. diff --git a/ext/dl/handle.c b/ext/dl/handle.c index 6b90e089ee..c967b2fb8e 100644 --- a/ext/dl/handle.c +++ b/ext/dl/handle.c @@ -5,6 +5,8 @@ #include <ruby.h> #include "dl.h" +#define SafeStringValuePtr(v) (rb_string_value(&v), rb_check_safe_obj(v), RSTRING_PTR(v)) + VALUE rb_cDLHandle; #ifdef _WIN32 @@ -132,11 +134,11 @@ rb_dlhandle_initialize(int argc, VALUE argv[], VALUE self) cflag = RTLD_LAZY | RTLD_GLOBAL; break; case 1: - clib = NIL_P(lib) ? NULL : StringValuePtr(lib); + clib = NIL_P(lib) ? NULL : SafeStringValuePtr(lib); cflag = RTLD_LAZY | RTLD_GLOBAL; break; case 2: - clib = NIL_P(lib) ? NULL : StringValuePtr(lib); + clib = NIL_P(lib) ? NULL : SafeStringValuePtr(lib); cflag = NUM2INT(flag); break; default: @@ -265,13 +267,16 @@ VALUE rb_dlhandle_sym(VALUE self, VALUE sym) { struct dl_handle *dlhandle; + const char *name; + + name = SafeStringValuePtr(sym); TypedData_Get_Struct(self, struct dl_handle, &dlhandle_data_type, dlhandle); if( ! dlhandle->open ){ rb_raise(rb_eDLError, "closed handle"); } - return dlhandle_sym(dlhandle->ptr, StringValueCStr(sym)); + return dlhandle_sym(dlhandle->ptr, name); } #ifndef RTLD_NEXT @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.1.8" #define RUBY_RELEASE_DATE "2015-12-16" -#define RUBY_PATCHLEVEL 439 +#define RUBY_PATCHLEVEL 440 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 12 |