1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added rb_secure(4). (Thanks to Minero Aoki)

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3608 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ttate 2003-03-24 07:56:37 +00:00
parent e5282ef182
commit ab7dac4027
4 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Mon Mar 24 16:55:04 2003 Takaaki Tateishi <ttate@ttsky.net>
* ext/dl/dl.c: added rb_secure(4). (Thanks to Minero Aoki)
* ext/dl/sym.c: ditto.
* ext/dl/ptr.c: ditto.
Mon Mar 24 00:09:02 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net> Mon Mar 24 00:09:02 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
* parse.y (block_append): warn unused literal. * parse.y (block_append): warn unused literal.

9
ext/dl/dl.c
View File

@ -542,18 +542,21 @@ 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);
return rb_class_new_instance(argc, argv, rb_cDLHandle); return rb_class_new_instance(argc, argv, rb_cDLHandle);
} }
VALUE VALUE
rb_dl_malloc(VALUE self, VALUE size) rb_dl_malloc(VALUE self, VALUE size)
{ {
rb_secure(4);
return rb_dlptr_malloc(DLNUM2LONG(size), dlfree); return rb_dlptr_malloc(DLNUM2LONG(size), dlfree);
} }
VALUE VALUE
rb_dl_strdup(VALUE self, VALUE str) rb_dl_strdup(VALUE self, VALUE str)
{ {
rb_secure(4);
str = rb_String(str); str = rb_String(str);
return rb_dlptr_new(strdup(RSTRING(str)->ptr), RSTRING(str)->len, dlfree); return rb_dlptr_new(strdup(RSTRING(str)->ptr), RSTRING(str)->len, dlfree);
} }
@ -561,6 +564,7 @@ rb_dl_strdup(VALUE self, VALUE str)
static VALUE static VALUE
rb_dl_sizeof(VALUE self, VALUE str) rb_dl_sizeof(VALUE self, VALUE str)
{ {
rb_secure(4);
return INT2NUM(dlsizeof(StringValuePtr(str))); return INT2NUM(dlsizeof(StringValuePtr(str)));
} }
@ -571,6 +575,7 @@ rb_dl_callback(int argc, VALUE argv[], VALUE self)
int rettype, entry, i; int rettype, entry, i;
char fname[127]; char fname[127];
rb_secure(4);
proc = Qnil; proc = Qnil;
switch( rb_scan_args(argc, argv, "11", &type, &proc) ){ switch( rb_scan_args(argc, argv, "11", &type, &proc) ){
case 1: case 1:
@ -636,9 +641,11 @@ rb_dl_callback(int argc, VALUE argv[], VALUE self)
static VALUE static VALUE
rb_dl_remove_callback(VALUE mod, VALUE sym) rb_dl_remove_callback(VALUE mod, VALUE sym)
{ {
freefunc_t f = rb_dlsym2csym(sym); freefunc_t f;
int i, j; int i, j;
rb_secure(4);
f = rb_dlsym2csym(sym);
for( i=0; i < CALLBACK_TYPES; i++ ){ for( i=0; i < CALLBACK_TYPES; i++ ){
for( j=0; j < MAX_CALLBACK; j++ ){ for( j=0; j < MAX_CALLBACK; j++ ){
if( rb_dl_callback_table[i][j] == f ){ if( rb_dl_callback_table[i][j] == f ){

5
ext/dl/ptr.c
View File

@ -26,6 +26,7 @@ rb_hash_delete(VALUE hash, VALUE key)
static void static void
rb_dlmem_delete(void *ptr) rb_dlmem_delete(void *ptr)
{ {
rb_secure(4);
rb_hash_delete(DLMemoryTable, DLLONG2NUM(ptr)); rb_hash_delete(DLMemoryTable, DLLONG2NUM(ptr));
} }
@ -89,6 +90,7 @@ rb_dlptr_new2(VALUE klass, void *ptr, long size, freefunc_t func)
struct ptr_data *data; struct ptr_data *data;
VALUE val; VALUE val;
rb_secure(4);
if( ptr ){ if( ptr ){
val = rb_dlmem_aref(ptr); val = rb_dlmem_aref(ptr);
if( val == Qnil ){ if( val == Qnil ){
@ -130,6 +132,7 @@ rb_dlptr_malloc(long size, freefunc_t func)
{ {
void *ptr; void *ptr;
rb_secure(4);
ptr = dlmalloc((size_t)size); ptr = dlmalloc((size_t)size);
memset(ptr,0,(size_t)size); memset(ptr,0,(size_t)size);
return rb_dlptr_new(ptr, size, func); return rb_dlptr_new(ptr, size, func);
@ -161,6 +164,7 @@ rb_dlptr_s_allocate(VALUE klass)
VALUE obj; VALUE obj;
struct ptr_data *data; struct ptr_data *data;
rb_secure(4);
obj = Data_Make_Struct(klass, struct ptr_data, 0, dlptr_free, data); obj = Data_Make_Struct(klass, struct ptr_data, 0, dlptr_free, data);
data->ptr = 0; data->ptr = 0;
data->free = 0; data->free = 0;
@ -850,6 +854,7 @@ rb_dlptr_aset(int argc, VALUE argv[], VALUE self)
long memsize; long memsize;
void *memimg; void *memimg;
rb_secure(4);
switch( rb_scan_args(argc, argv, "21", &key, &num, &val) ){ switch( rb_scan_args(argc, argv, "21", &key, &num, &val) ){
case 2: case 2:
val = num; val = num;

2
ext/dl/sym.c
View File

@ -77,6 +77,7 @@ rb_dlsym_new(void (*func)(), const char *name, const char *type)
struct sym_data *data; struct sym_data *data;
const char *ptype; const char *ptype;
rb_secure(4);
if( !type || !type[0] ){ if( !type || !type[0] ){
return rb_dlptr_new((void*)func, 0, 0); return rb_dlptr_new((void*)func, 0, 0);
} }
@ -329,6 +330,7 @@ rb_dlsym_call(int argc, VALUE argv[], VALUE self)
long ftype; long ftype;
void *func; void *func;
rb_secure(4);
Data_Get_Struct(self, struct sym_data, sym); Data_Get_Struct(self, struct sym_data, sym);
DEBUG_CODE({ DEBUG_CODE({
printf("rb_dlsym_call(): type = '%s', func = 0x%x\n", sym->type, sym->func); printf("rb_dlsym_call(): type = '%s', func = 0x%x\n", sym->type, sym->func);