From 3ce9a14040dae1cc69ddebdeb37e4895ed6adda6 Mon Sep 17 00:00:00 2001 From: normal Date: Tue, 30 Jan 2018 23:55:49 +0000 Subject: ruby.h: relax rb_funcall check on extra args for clang clang 5.+ (tested clang 7.0.0) seems to be attempting division-by-zero and giving a very large number for static args to rb_funcall. * include/ruby/ruby.h (rb_varargs_bad_length): relax check for clang * ext/-test-/funcall/funcall.c: renamed from passing_block.c define extra_args_name function * test/-ext-/funcall/test_funcall.rb: new test [ruby-core:85266] [Bug #14425] From: Eric Wong git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62116 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- include/ruby/ruby.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/ruby/ruby.h') diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index bd635f3b7c..372b16891b 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -1783,6 +1783,8 @@ VALUE rb_check_symbol(volatile VALUE *namep); # if defined(HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P) # if HAVE_ATTRIBUTE_ERRORFUNC ERRORFUNC((" argument length doesn't match"), int rb_varargs_bad_length(int,int)); +# elif defined(__clang__) /* [ruby-core:85266] [Bug #14425] */ +# define rb_varargs_bad_length(argc, vargc) ((argc)/((argc) <= (vargc))) # else # define rb_varargs_bad_length(argc, vargc) ((argc)/((argc) == (vargc))) # endif -- cgit v1.2.3