diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-03-11 15:01:47 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-03-11 15:01:47 +0000 |
| commit | 5952769bd377315f6124d5812ee7e161b1da1283 (patch) | |
| tree | fe1a6d367908e53922432501bbf182212b457b89 | |
| parent | d11b6f0cfcc676a4315bfad43a83e276a05c83d9 (diff) | |
* merge -c 12028
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@12033 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ext/dl/mkcallback.rb | 3 | ||||
| -rw-r--r-- | version.h | 8 |
3 files changed, 14 insertions, 4 deletions
@@ -1,3 +1,10 @@ +Sun Mar 11 17:45:51 2007 Akinori MUSHA <knu@iDaemons.org> + + * ext/dl/mkcallback.rb (mkfunc): Make sure that a callback + function is found in the function table before trying to call + it; submitted by sheepman <sheepman AT sheepman.sakura.ne.jp> + in [ruby-dev:30524]. + Tue Mar 6 18:58:37 2007 Keiju Ishitsuka <keiju@ruby-lang.org> * lib/shell/process-controller.rb: fix thread synchronization diff --git a/ext/dl/mkcallback.rb b/ext/dl/mkcallback.rb index b7ea1718d0..c9f92e4a0d 100644 --- a/ext/dl/mkcallback.rb +++ b/ext/dl/mkcallback.rb @@ -31,6 +31,9 @@ def mkfunc(rettype, fnum, argc) subst_code, "", " obj = rb_hash_aref(DLFuncTable, rb_assoc_new(INT2NUM(#{rettype.to_s}),INT2NUM(#{fnum.to_s})));", + " if(NIL_P(obj))", + " rb_raise(rb_eDLError, \"callback function does not exist in DL::FuncTable\");", + " Check_Type(obj, T_ARRAY);", " proto = rb_ary_entry(obj, 0);", " proc = rb_ary_entry(obj, 1);", " Check_Type(proto, T_STRING);", @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.5" -#define RUBY_RELEASE_DATE "2007-03-08" +#define RUBY_RELEASE_DATE "2007-03-12" #define RUBY_VERSION_CODE 185 -#define RUBY_RELEASE_CODE 20070308 -#define RUBY_PATCHLEVEL 29 +#define RUBY_RELEASE_CODE 20070312 +#define RUBY_PATCHLEVEL 30 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 5 #define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 8 +#define RUBY_RELEASE_DAY 12 RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_release_date[]; |