kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 17872:

Browse source 
* 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_7@18479 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2008-08-11 00:37:21 +00:00
parent e1ae7c2e67
commit 2691446e0f
4 changed files with 25 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -31,6 +31,15 @@ Mon Aug 4 13:31:41 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* numeric.c (check_uint, rb_num2uint, rb_fix2uint): strict check. * numeric.c (check_uint, rb_num2uint, rb_fix2uint): strict check.
fixed [ruby-dev:33683] fixed [ruby-dev:33683]
Mon Aug 11 09:37:17 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* 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.
Thu Jul 17 21:42:07 2008 URABE Shyouhei <shyouhei@ruby-lang.org> Thu Jul 17 21:42:07 2008 URABE Shyouhei <shyouhei@ruby-lang.org>

14
ext/dl/dl.c
View file

@ -522,12 +522,15 @@ rb_str_to_ptr(VALUE self)
{ {
char *ptr; char *ptr;
int len; int len;
VALUE p;
len = RSTRING(self)->len; len = RSTRING(self)->len;
ptr = (char*)dlmalloc(len + 1); ptr = (char*)dlmalloc(len + 1);
memcpy(ptr, RSTRING(self)->ptr, len); memcpy(ptr, RSTRING(self)->ptr, len);
ptr[len] = '\0'; 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 VALUE
@ -545,7 +548,12 @@ rb_ary_to_ptr(int argc, VALUE argv[], VALUE self)
ptr = rb_ary2cary(0, self, &size); ptr = rb_ary2cary(0, self, &size);
break; 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 VALUE
@ -563,7 +571,7 @@ rb_io_to_ptr(VALUE self)
VALUE VALUE
rb_dl_dlopen(int argc, VALUE argv[], VALUE self) rb_dl_dlopen(int argc, VALUE argv[], VALUE self)
{ {
rb_secure(4); rb_secure(2);
return rb_class_new_instance(argc, argv, rb_cDLHandle); return rb_class_new_instance(argc, argv, rb_cDLHandle);
} }

1
ext/dl/sym.c
View file

@ -492,6 +492,7 @@ rb_dlsym_call(int argc, VALUE argv[], VALUE self)
rb_raise(rb_eDLTypeError, "unexpected type of argument #%d", i); rb_raise(rb_eDLTypeError, "unexpected type of argument #%d", i);
} }
} }
rb_check_safe_obj(pval);
Data_Get_Struct(pval, struct ptr_data, data); Data_Get_Struct(pval, struct ptr_data, data);
ANY2P(args[i]) = DLVOIDP(data->ptr); ANY2P(args[i]) = DLVOIDP(data->ptr);
} }

8
version.h
View file

@ -1,15 +1,15 @@
#define RUBY_VERSION "1.8.7" #define RUBY_VERSION "1.8.7"
#define RUBY_RELEASE_DATE "2008-08-08" #define RUBY_RELEASE_DATE "2008-08-11"
#define RUBY_VERSION_CODE 187 #define RUBY_VERSION_CODE 187
#define RUBY_RELEASE_CODE 20080808 #define RUBY_RELEASE_CODE 20080811
#define RUBY_PATCHLEVEL 71 #define RUBY_PATCHLEVEL 72
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 7 #define RUBY_VERSION_TEENY 7
#define RUBY_RELEASE_YEAR 2008 #define RUBY_RELEASE_YEAR 2008
#define RUBY_RELEASE_MONTH 8 #define RUBY_RELEASE_MONTH 8
#define RUBY_RELEASE_DAY 8 #define RUBY_RELEASE_DAY 11
#ifdef RUBY_EXTERN #ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_version[];