mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* ext/nkf/nkf.c (rb_nkf_convert, rb_nkf_guess): check too huge
string. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27947 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
ca3f208b3b
commit
6d1940fed9
2 changed files with 8 additions and 3 deletions
|
|
@ -1,3 +1,8 @@
|
||||||
|
Fri May 21 19:11:42 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
|
* ext/nkf/nkf.c (rb_nkf_convert, rb_nkf_guess): check too huge
|
||||||
|
string.
|
||||||
|
|
||||||
Fri May 21 18:12:12 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
Fri May 21 18:12:12 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
* include/ruby/ruby.h (rb_intern): C90 needs nonempty macro
|
* include/ruby/ruby.h (rb_intern): C90 needs nonempty macro
|
||||||
|
|
|
||||||
|
|
@ -155,12 +155,12 @@ rb_nkf_convert(VALUE obj, VALUE opt, VALUE src)
|
||||||
input_ctr = 0;
|
input_ctr = 0;
|
||||||
StringValue(src);
|
StringValue(src);
|
||||||
input = (unsigned char *)RSTRING_PTR(src);
|
input = (unsigned char *)RSTRING_PTR(src);
|
||||||
i_len = RSTRING_LEN(src);
|
i_len = RSTRING_LENINT(src);
|
||||||
tmp = result = rb_str_new(0, i_len*3 + 10);
|
tmp = result = rb_str_new(0, i_len*3 + 10);
|
||||||
|
|
||||||
output_ctr = 0;
|
output_ctr = 0;
|
||||||
output = (unsigned char *)RSTRING_PTR(result);
|
output = (unsigned char *)RSTRING_PTR(result);
|
||||||
o_len = RSTRING_LEN(result);
|
o_len = RSTRING_LENINT(result);
|
||||||
*output = '\0';
|
*output = '\0';
|
||||||
|
|
||||||
kanji_convert(NULL);
|
kanji_convert(NULL);
|
||||||
|
|
@ -192,7 +192,7 @@ rb_nkf_guess(VALUE obj, VALUE src)
|
||||||
input_ctr = 0;
|
input_ctr = 0;
|
||||||
StringValue(src);
|
StringValue(src);
|
||||||
input = (unsigned char *)RSTRING_PTR(src);
|
input = (unsigned char *)RSTRING_PTR(src);
|
||||||
i_len = RSTRING_LEN(src);
|
i_len = RSTRING_LENINT(src);
|
||||||
|
|
||||||
guess_f = TRUE;
|
guess_f = TRUE;
|
||||||
kanji_convert( NULL );
|
kanji_convert( NULL );
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue