1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* sprintf.c (rb_str_format): a bug in %c type check.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10666 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2006-08-04 11:46:44 +00:00
parent 90ba0eac46
commit a97af1c6aa
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -14,6 +14,10 @@ Fri Aug 4 13:56:51 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* pack.c (pack_pack): check argument overrun for 'P'. based on a * pack.c (pack_pack): check argument overrun for 'P'. based on a
patch by rucila <rucila at yahoo.cojp>. fixed: [ruby-dev:29182] patch by rucila <rucila at yahoo.cojp>. fixed: [ruby-dev:29182]
Fri Aug 4 02:42:29 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* sprintf.c (rb_str_format): a bug in %c type check.
Fri Aug 4 01:28:19 2006 Tanaka Akira <akr@fsij.org> Fri Aug 4 01:28:19 2006 Tanaka Akira <akr@fsij.org>
* io.c (io_reopen): STDERR.reopen(File.open("/dev/null", "w")) should * io.c (io_reopen): STDERR.reopen(File.open("/dev/null", "w")) should

8
sprintf.c
View File

@ -399,13 +399,15 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
case 'c': case 'c':
{ {
VALUE val = GETARG(); VALUE val = GETARG();
VALUE tmp;
char c; char c;
if (rb_check_string_type(val)) { tmp = rb_check_string_type(val);
if (RSTRING(val)->len != 1) { if (!NIL_P(tmp)) {
if (RSTRING(tmp)->len != 1) {
rb_raise(rb_eArgError, "%%c requires a character"); rb_raise(rb_eArgError, "%%c requires a character");
} }
c = RSTRING(val)->ptr[0]; c = RSTRING(tmp)->ptr[0];
} }
else { else {
c = NUM2INT(val) & 0xff; c = NUM2INT(val) & 0xff;