naruse	2012-02-15 05:05:04 +0900 (Wed, 15 Feb 2012)

  New Revision: 34603

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

  Log:
    merge revision(s) 32720: [Backport #6015]
    
    * ext/dl/cptr.c (rb_dlptr_aref, rb_dlptr_aset): check NULL pointer
      dereference.

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/ext/dl/cptr.c
    branches/ruby_1_9_3/test/dl/test_cptr.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34602)
+++ ruby_1_9_3/ChangeLog	(revision 34603)
@@ -1,5 +1,8 @@
-Wed Feb 15 05:03:41 2012  Masatoshi SEKI  <m_seki@m...>
+Wed Feb 15 05:04:47 2012  Nobuyoshi Nakada  <nobu@r...>
 
+	* ext/dl/cptr.c (rb_dlptr_aref, rb_dlptr_aset): check NULL pointer
+	  dereference.
+
 	* test/rinda/test_rinda.rb: decrease the code that depends on timing.
 	  [Bug #372] [Bug #4160]
 
Index: ruby_1_9_3/ext/dl/cptr.c
===================================================================
--- ruby_1_9_3/ext/dl/cptr.c	(revision 34602)
+++ ruby_1_9_3/ext/dl/cptr.c	(revision 34603)
@@ -487,16 +487,19 @@
     VALUE arg0, arg1;
     VALUE retval = Qnil;
     size_t offset, len;
+    struct ptr_data *data;
 
+    TypedData_Get_Struct(self, struct ptr_data, &dlptr_data_type, data);
+    if (!data->ptr) rb_raise(rb_eDLError, "NULL pointer dereference");
     switch( rb_scan_args(argc, argv, "11", &arg0, &arg1) ){
       case 1:
 	offset = NUM2ULONG(arg0);
-	retval = INT2NUM(*((char*)RPTR_DATA(self)->ptr + offset));
+	retval = INT2NUM(*((char *)data->ptr + offset));
 	break;
       case 2:
 	offset = NUM2ULONG(arg0);
 	len    = NUM2ULONG(arg1);
-	retval = rb_tainted_str_new((char *)RPTR_DATA(self)->ptr + offset, len);
+	retval = rb_tainted_str_new((char *)data->ptr + offset, len);
 	break;
       default:
 	rb_bug("rb_dlptr_aref()");
@@ -520,17 +523,20 @@
     VALUE retval = Qnil;
     size_t offset, len;
     void *mem;
+    struct ptr_data *data;
 
+    TypedData_Get_Struct(self, struct ptr_data, &dlptr_data_type, data);
+    if (!data->ptr) rb_raise(rb_eDLError, "NULL pointer dereference");
     switch( rb_scan_args(argc, argv, "21", &arg0, &arg1, &arg2) ){
       case 2:
 	offset = NUM2ULONG(arg0);
-	((char*)RPTR_DATA(self)->ptr)[offset] = NUM2UINT(arg1);
+	((char*)data->ptr)[offset] = NUM2UINT(arg1);
 	retval = arg1;
 	break;
       case 3:
 	offset = NUM2ULONG(arg0);
 	len    = NUM2ULONG(arg1);
-	if( TYPE(arg2) == T_STRING ){
+	if (RB_TYPE_P(arg2, T_STRING)) {
 	    mem = StringValuePtr(arg2);
 	}
 	else if( rb_obj_is_kind_of(arg2, rb_cDLCPtr) ){
@@ -539,7 +545,7 @@
 	else{
 	    mem    = NUM2PTR(arg2);
 	}
-	memcpy((char *)RPTR_DATA(self)->ptr + offset, mem, len);
+	memcpy((char *)data->ptr + offset, mem, len);
 	retval = arg2;
 	break;
       default:
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34602)
+++ ruby_1_9_3/version.h	(revision 34603)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 113
+#define RUBY_PATCHLEVEL 114
 
 #define RUBY_RELEASE_DATE "2012-02-15"
 #define RUBY_RELEASE_YEAR 2012
Index: ruby_1_9_3/test/dl/test_cptr.rb
===================================================================
--- ruby_1_9_3/test/dl/test_cptr.rb	(revision 34602)
+++ ruby_1_9_3/test/dl/test_cptr.rb	(revision 34603)
@@ -212,5 +212,11 @@
       assert_equal ptr3.to_i, ptr[0,2] = ptr3.to_i
       check.call(str, ptr)
     end
+
+    def test_null_pointer
+      nullpo = CPtr.new(0)
+      assert_raise(DLError) {nullpo[0]}
+      assert_raise(DLError) {nullpo[0] = 1}
+    end
   end
 end

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