diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-05-14 11:13:40 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-05-14 11:13:40 +0000 |
commit | 19f0852363d26f44307e40d0c447f7527b4c36d8 (patch) | |
tree | 710578840c63986a5ed389ee4190f057a5c601c1 /ext/fiddle | |
parent | 25e5b66798e1b11afd5aad6560c9136677090c52 (diff) |
merge revision(s) 40728:
* ext/dl/lib/dl/func.rb (DL::Function#call): check tainted when
$SAFE > 0.
* ext/fiddle/function.c (function_call): check tainted when $SAFE > 0.
* test/fiddle/test_func.rb (module Fiddle): add test for above.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40729 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/fiddle')
-rw-r--r-- | ext/fiddle/function.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/ext/fiddle/function.c b/ext/fiddle/function.c index c184c78663..eecd755f1f 100644 --- a/ext/fiddle/function.c +++ b/ext/fiddle/function.c @@ -126,6 +126,15 @@ function_call(int argc, VALUE argv[], VALUE self) TypedData_Get_Struct(self, ffi_cif, &function_data_type, cif); + if (rb_safe_level() >= 1) { + for (i = 0; i < argc; i++) { + VALUE src = argv[i]; + if (OBJ_TAINTED(src)) { + rb_raise(rb_eSecurityError, "tainted parameter not allowed"); + } + } + } + values = xcalloc((size_t)argc + 1, (size_t)sizeof(void *)); generic_args = xcalloc((size_t)argc, (size_t)sizeof(fiddle_generic)); |