From 74dcda0d418c5a5eb27047cd0e4a2bf04b637834 Mon Sep 17 00:00:00 2001 From: naruse Date: Wed, 13 Oct 2010 12:13:53 +0000 Subject: [PATCH] * numeric.c (int_chr): raise error when the value is negative. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29483 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ numeric.c | 11 ++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index add179b06e..cf7d30b7d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Wed Oct 13 21:13:00 2010 NARUSE, Yui + + * numeric.c (int_chr): raise error when the value is negative. + Wed Oct 13 19:24:08 2010 URABE Shyouhei * vm.c (ruby_vm_destruct): This function type was wrong; correct to the prototype. diff --git a/numeric.c b/numeric.c index c27187f4f4..26ce683daa 100644 --- a/numeric.c +++ b/numeric.c @@ -2120,9 +2120,18 @@ static VALUE int_chr(int argc, VALUE *argv, VALUE num) { char c; - unsigned int i = NUM2UINT(num); + unsigned int i; rb_encoding *enc; + if (rb_num_to_uint(num, &i) == 0) { + } + else if (FIXNUM_P(num)) { + rb_raise(rb_eRangeError, "%ld out of char range", FIX2LONG(num)); + } + else { + rb_raise(rb_eRangeError, "bignum out of char range"); + } + switch (argc) { case 0: if (0xff < i) {