diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-03-23 04:19:24 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-03-23 04:19:24 +0000 |
commit | 163ab0a4da61699c84bba46cd9d7bdd6c67ba1e5 (patch) | |
tree | b3d60ff105b63c425773e4b8ad58627730a2f7ef /string.c | |
parent | a13486997a65320f3abcded92e9edc9433a42a43 (diff) | |
download | ruby-163ab0a4da61699c84bba46cd9d7bdd6c67ba1e5.tar.gz |
* bignum.c (rb_str_to_inum): must be ASCII compatible encoding as
well as String#hex and String#oct. [ruby-core:43566][Bug #6192]
* string.c (rb_must_asciicompat): check if ASCII compatible.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35120 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'string.c')
-rw-r--r-- | string.c | 19 |
1 files changed, 9 insertions, 10 deletions
@@ -1409,6 +1409,15 @@ rb_str_associated(VALUE str) return Qfalse; } +void +rb_must_asciicompat(VALUE str) +{ + rb_encoding *enc = rb_enc_get(str); + if (!rb_enc_asciicompat(enc)) { + rb_raise(rb_eEncCompatError, "ASCII incompatible encoding: %s", rb_enc_name(enc)); + } +} + VALUE rb_string_value(volatile VALUE *ptr) { @@ -6722,11 +6731,6 @@ rb_str_scan(VALUE str, VALUE pat) static VALUE rb_str_hex(VALUE str) { - rb_encoding *enc = rb_enc_get(str); - - if (!rb_enc_asciicompat(enc)) { - rb_raise(rb_eEncCompatError, "ASCII incompatible encoding: %s", rb_enc_name(enc)); - } return rb_str_to_inum(str, 16, FALSE); } @@ -6748,11 +6752,6 @@ rb_str_hex(VALUE str) static VALUE rb_str_oct(VALUE str) { - rb_encoding *enc = rb_enc_get(str); - - if (!rb_enc_asciicompat(enc)) { - rb_raise(rb_eEncCompatError, "ASCII incompatible encoding: %s", rb_enc_name(enc)); - } return rb_str_to_inum(str, -8, FALSE); } |