shyouhei	2008-08-11 09:36:08 +0900 (Mon, 11 Aug 2008)

  New Revision: 18477

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=18477

  Log:
    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.

  Modified files:
    branches/ruby_1_8_6/ChangeLog
    branches/ruby_1_8_6/ext/dl/dl.c
    branches/ruby_1_8_6/ext/dl/sym.c
    branches/ruby_1_8_6/version.h

Index: ruby_1_8_6/ext/dl/dl.c
===================================================================
--- ruby_1_8_6/ext/dl/dl.c	(revision 18476)
+++ ruby_1_8_6/ext/dl/dl.c	(revision 18477)
@@ -522,12 +522,15 @@
 {
   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 @@
     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 @@
 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);
 }
 
Index: ruby_1_8_6/ext/dl/sym.c
===================================================================
--- ruby_1_8_6/ext/dl/sym.c	(revision 18476)
+++ ruby_1_8_6/ext/dl/sym.c	(revision 18477)
@@ -492,6 +492,7 @@
 	      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);
 	}
Index: ruby_1_8_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog	(revision 18476)
+++ ruby_1_8_6/ChangeLog	(revision 18477)
@@ -31,6 +31,15 @@
 Mon Aug  4 12:25:08 2008  NAKAMURA Usaku  <usa@r...>
 
 	* numeric.c (check_uint, rb_num2uint, rb_fix2uint): fixed wrong check
+Mon Aug 11 09:34:52 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* 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.
+
 	  about 64bit positive value.
 Mon Aug  4 12:25:08 2008  NAKAMURA Usaku  <usa@r...>
 
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 18476)
+++ ruby_1_8_6/version.h	(revision 18477)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2008-08-08"
+#define RUBY_RELEASE_DATE "2008-08-11"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20080808
-#define RUBY_PATCHLEVEL 286
+#define RUBY_RELEASE_CODE 20080811
+#define RUBY_PATCHLEVEL 287
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 8
-#define RUBY_RELEASE_DAY 8
+#define RUBY_RELEASE_DAY 11
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/