security enhancement of dl library (need test).

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3609 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

eval.c

@@ -139,7 +139,7 @@ rb_secure(level)
 }
 
 void
-rb_check_safe_str(x)
+rb_check_safe_obj(x)
     VALUE x;
 {
     if (ruby_safe_level > 0 && OBJ_TAINTED(x)){
@@ -152,6 +152,13 @@ rb_check_safe_str(x)
 	}
     }
     rb_secure(4);
+}
+
+void
+rb_check_safe_str(x)
+    VALUE x;
+{
+    rb_check_safe_obj(x);
     if (TYPE(x)!= T_STRING) {
 	rb_raise(rb_eTypeError, "wrong argument type %s (expected String)",
 		 rb_obj_classname(x));

ext/dl/dl.c

@@ -401,7 +401,7 @@ c_parray(VALUE v, long *size)
 {
   int i, len;
   void **ary;
-  VALUE e;
+  VALUE e, tmp;
 
   len = RARRAY(v)->len;
   *size = sizeof(void*) * len;
@@ -409,7 +409,15 @@ c_parray(VALUE v, long *size)
   for (i=0; i < len; i++) {
     e = rb_ary_entry(v, i);
     switch (TYPE(e)) {
+    default:
+      tmp = rb_check_string_type(e);
+      if (NIL_P(tmp)) {
+	  rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
+      }
+      e = tmp;
+      /* fall through */
     case T_STRING:
+      rb_check_safe_str(e);
       {
 	char *str, *src;
 	src = RSTRING(e)->ptr;
@@ -430,9 +438,6 @@ c_parray(VALUE v, long *size)
 	rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
       }
       break;
-    default:
-      rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
-      break;
     }
   }
 
@@ -445,9 +450,11 @@ rb_ary2cary(char t, VALUE v, long *size)
   int len;
   VALUE val0;
 
-  if( TYPE(v) != T_ARRAY ){
+  val0 = rb_check_array_type(v);
+  if(NIL_P(TYPE(val0))) {
     rb_raise(rb_eDLTypeError, "an array is expected.");
   }
+  v = val0;
 
   len = RARRAY(v)->len;
   if (len == 0) {
@@ -556,15 +563,13 @@ rb_dl_malloc(VALUE self, VALUE size)
 VALUE
 rb_dl_strdup(VALUE self, VALUE str)
 {
-  rb_secure(4);
+  SafeStringValue(str);
-  str = rb_String(str);
   return rb_dlptr_new(strdup(RSTRING(str)->ptr), RSTRING(str)->len, dlfree);
 }
 
 static VALUE
 rb_dl_sizeof(VALUE self, VALUE str)
 {
-  rb_secure(4);
   return INT2NUM(dlsizeof(StringValuePtr(str)));
 }
 
@@ -589,7 +594,7 @@ rb_dl_callback(int argc, VALUE argv[], VALUE self)
     break;
   }
 
-  Check_Type(type, T_STRING);
+  StringValue(type);
   switch (RSTRING(type)->ptr[0]) {
   case '0':
     rettype = 0x00;

ext/dl/handle.c

@@ -138,7 +138,9 @@ rb_dlhandle_sym(int argc, VALUE argv[], VALUE self)
   const char *name, *stype;
   const char *err;
 
+  rb_secure(4);
   if (rb_scan_args(argc, argv, "11", &sym, &type) == 2) {
+    SafeStringValue(type);
     stype = StringValuePtr(type);
   }
   else{
@@ -153,6 +155,7 @@ rb_dlhandle_sym(int argc, VALUE argv[], VALUE self)
 #endif
   }
   else{
+    SafeStringValue(sym);
     name = StringValuePtr(sym);
   }
 

ext/dl/ptr.c

@@ -82,6 +82,7 @@ dlptr_init(VALUE val)
 	   data->ptr);
   });
   rb_dlmem_aset(data->ptr, val);
+  OBJ_TAINT(val);
 }
 
 VALUE
@@ -552,10 +553,7 @@ rb_dlptr_define_data_type(int argc, VALUE argv[], VALUE self)
   Check_Type(rest, T_ARRAY);
   num = RARRAY(rest)->len;
   for (i=0; i<num; i++) {
-    vid = rb_ary_entry(rest,i);
+    rb_to_id(rb_ary_entry(rest,i));
-    if( !(TYPE(vid)==T_STRING || TYPE(vid)==T_SYMBOL) ){
-      rb_raise(rb_eTypeError, "#%d must be a string or symbol", i + 2);
-    }
   }
 
   data->ctype = t;
@@ -747,7 +745,7 @@ rb_dlptr_aref(int argc, VALUE argv[], VALUE self)
     pass[0] = num;
     return rb_dlptr_to_str(1, pass, rb_dlptr_plus(self, key));
   }
-
+  rb_to_id(key);
   if (! (TYPE(key) == T_STRING || TYPE(key) == T_SYMBOL)) {
     rb_raise(rb_eTypeError, "the key must be a string or symbol");
   }
@@ -882,10 +880,6 @@ rb_dlptr_aset(int argc, VALUE argv[], VALUE self)
     return val;
   }
 
-  if( ! (TYPE(key) == T_STRING || TYPE(key) == T_SYMBOL ) ){
-    rb_raise(rb_eTypeError, "the key must be a string or symbol");
-  }
-
   id = rb_to_id(key);
   Data_Get_Struct(self, struct ptr_data, data);
   switch (data->ctype) {

ext/dl/sym.c

@@ -330,7 +330,7 @@ rb_dlsym_call(int argc, VALUE argv[], VALUE self)
   long ftype;
   void *func;
 
-  rb_secure(4);
+  rb_secure(2);
   Data_Get_Struct(self, struct sym_data, sym);
   DEBUG_CODE({
     printf("rb_dlsym_call(): type = '%s', func = 0x%x\n", sym->type, sym->func);
@@ -457,20 +457,20 @@ rb_dlsym_call(int argc, VALUE argv[], VALUE self)
 	ANY2S(args[i]) = DLSTR(0);
       }
       else{
-	if( TYPE(argv[i]) != T_STRING ){
+	VALUE str = argv[i];
-	  rb_raise(rb_eDLError, "#%d must be a string",i);
+	SafeStringValue(str);
-	}
+	ANY2S(args[i]) = DLSTR(RSTRING(str)->ptr);
-	ANY2S(args[i]) = DLSTR(RSTRING(argv[i])->ptr);
       }
       PUSH_P(ftype);
       break;
     case 's':
-      if( TYPE(argv[i]) != T_STRING ){
+      {
-	rb_raise(rb_eDLError, "#%d must be a string",i);
+	VALUE str = argv[i];
-      }
+	SafeStringValue(str);
-      ANY2S(args[i]) = DLSTR(dlmalloc(RSTRING(argv[i])->len + 1));
+	ANY2S(args[i]) = DLSTR(dlmalloc(RSTRING(str)->len + 1));
-      memcpy((char*)(ANY2S(args[i])), RSTRING(argv[i])->ptr, RSTRING(argv[i])->len + 1);
+	memcpy((char*)(ANY2S(args[i])), RSTRING(str)->ptr, RSTRING(str)->len + 1);
 	dtypes[i] = 's';
+      }
       PUSH_P(ftype);
       break;
     default:

lib/jcode.rb

@@ -19,9 +19,9 @@ class String
   PATTERN_EUC = '[\xa1-\xfe][\xa1-\xfe]'
   PATTERN_UTF8 = '[\xc0-\xdf][\x80-\xbf]|[\xe0-\xef][\x80-\xbf][\x80-\xbf]'
 
-  RE_SJIS = Regexp.new(PATTERN_SJIS, 'n')
+  RE_SJIS = Regexp.new(PATTERN_SJIS, 0, 'n')
-  RE_EUC = Regexp.new(PATTERN_EUC, 'n')
+  RE_EUC = Regexp.new(PATTERN_EUC, 0, 'n')
-  RE_UTF8 = Regexp.new(PATTERN_UTF8, 'n')
+  RE_UTF8 = Regexp.new(PATTERN_UTF8, 0, 'n')
 
   SUCC = {}
   SUCC['s'] = Hash.new(1)

object.c

@@ -773,12 +773,14 @@ ID
 rb_to_id(name)
     VALUE name;
 {
+    VALUE tmp;
     ID id;
 
     switch (TYPE(name)) {
       case T_STRING:
 	return rb_intern(RSTRING(name)->ptr);
       case T_FIXNUM:
+	rb_warn("do not use Fixnums as Symbols");
 	id = FIX2LONG(name);
 	if (!rb_id2name(id)) {
 	    rb_raise(rb_eArgError, "%ld is not a symbol", id);
@@ -788,6 +790,10 @@ rb_to_id(name)
 	id = SYM2ID(name);
 	break;
       default:
+	tmp = rb_check_string_type(name);
+	if (!NIL_P(tmp)) {
+	    return rb_intern(RSTRING(tmp)->ptr);
+	}
 	rb_raise(rb_eTypeError, "%s is not a symbol", RSTRING(rb_inspect(name))->ptr);
     }
     return id;

ruby.h

@@ -215,12 +215,14 @@ VALUE rb_string_value _((volatile VALUE*));
 char *rb_string_value_ptr _((volatile VALUE*));
 
 #define StringValue(v) if (TYPE(v) != T_STRING) rb_string_value(&(v))
+#define StringValuePtr(v) rb_string_value_ptr(&(v))
+
+void rb_check_safe_obj _((VALUE));
 void rb_check_safe_str _((VALUE));
 #define SafeStringValue(v) do {\
     StringValue(v);\
-    rb_check_safe_str(v);\
+    rb_check_safe_obj(v);\
 } while (0)
-#define StringValuePtr(v) rb_string_value_ptr(&(v))
 /* obsolete macro - use SafeStringValue(v) */
 #define Check_SafeStr(v) rb_check_safe_str((VALUE)(v))
 

version.h

@@ -1,11 +1,11 @@
 #define RUBY_VERSION "1.8.0"
-#define RUBY_RELEASE_DATE "2003-03-23"
+#define RUBY_RELEASE_DATE "2003-03-24"
 #define RUBY_VERSION_CODE 180
-#define RUBY_RELEASE_CODE 20030323
+#define RUBY_RELEASE_CODE 20030324
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 0
 #define RUBY_RELEASE_YEAR 2003
-#define RUBY_RELEASE_MONTH 03
+#define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 23
+#define RUBY_RELEASE_DAY 24