1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

merges r30657 from trunk into ruby_1_9_2.

--
	* vm_eval.c (rb_throw_obj): add GC guard to prevent intermediate
	  variable from GC. [Bug #4322] [ruby-dev:43108]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30897 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2011-02-18 10:43:34 +00:00
parent 25394cb929
commit a474c66f46
3 changed files with 10 additions and 4 deletions

View file

@ -1,3 +1,8 @@
Wed Jan 26 22:28:49 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
* vm_eval.c (rb_throw_obj): add GC guard to prevent intermediate
variable from GC. [Bug #4322] [ruby-dev:43108]
Wed Jan 26 10:36:28 2011 NARUSE, Yui <naruse@ruby-lang.org>
* string.c (=~): documentation fix; the return value is nil when

View file

@ -1,13 +1,13 @@
#define RUBY_VERSION "1.9.2"
#define RUBY_PATCHLEVEL 174
#define RUBY_PATCHLEVEL 175
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1
#define RUBY_RELEASE_YEAR 2011
#define RUBY_RELEASE_MONTH 1
#define RUBY_RELEASE_DAY 28
#define RUBY_RELEASE_DATE "2011-01-28"
#define RUBY_RELEASE_MONTH 2
#define RUBY_RELEASE_DAY 18
#define RUBY_RELEASE_DATE "2011-02-18"
#include "ruby/version.h"

View file

@ -1437,6 +1437,7 @@ rb_throw_obj(VALUE tag, VALUE value)
}
if (!tt) {
VALUE desc = rb_inspect(tag);
RB_GC_GUARD(desc);
rb_raise(rb_eArgError, "uncaught throw %s", RSTRING_PTR(desc));
}
rb_trap_restore_mask();