diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-14 20:05:04 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-14 20:05:04 +0000 |
| commit | 0c8cfb4eabc5c00e17439a61d274e8c74eefeef2 (patch) | |
| tree | 7d34f209a3c7c3446d87335c0e5cd400aa23ec4a /ext | |
| parent | 44d3cf03fd13ba0d83aca858cc53e71b71958354 (diff) | |
merge revision(s) 32720: [Backport #6015]
* ext/dl/cptr.c (rb_dlptr_aref, rb_dlptr_aset): check NULL pointer
dereference.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34603 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/dl/cptr.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/ext/dl/cptr.c b/ext/dl/cptr.c index 478fb7126e..0f6271fd8e 100644 --- a/ext/dl/cptr.c +++ b/ext/dl/cptr.c @@ -487,16 +487,19 @@ rb_dlptr_aref(int argc, VALUE argv[], VALUE self) 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 @@ rb_dlptr_aset(int argc, VALUE argv[], VALUE self) 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 @@ rb_dlptr_aset(int argc, VALUE argv[], VALUE self) else{ mem = NUM2PTR(arg2); } - memcpy((char *)RPTR_DATA(self)->ptr + offset, mem, len); + memcpy((char *)data->ptr + offset, mem, len); retval = arg2; break; default: |