archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-16 17:14:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merge revision(s) r46098: [Backport #9861]

Browse source 
* vsnprintf.c (BSD_vfprintf): fix string width when precision is
	  given.  as the result of `memchr` is NULL or its offset from the
	  start cannot exceed the size, the comparison was always false.
	  [ruby-core:62737] [Bug #9861]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46611 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2014-06-29 17:17:20 +00:00
parent 8a33324477
commit 0caeba64c3
5 changed files with 30 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
ext/-test-/printf/printf.c
View file

@ -42,18 +42,23 @@ utoa(char *p, char *e, unsigned int x)
static VALUE
printf_test_call(int argc, VALUE *argv, VALUE self)
{
VALUE opt, type, num;
VALUE opt, type, num, result;
char format[sizeof(int) * 6 + 8], *p = format, cnv;
int n;
const char *s;
rb_scan_args(argc, argv, "2:", &type, &num, &opt);
Check_Type(type, T_STRING);
if (RSTRING_LEN(type) != 1) rb_raise(rb_eArgError, "wrong length(%ld)", RSTRING_LEN(type));
switch (cnv = RSTRING_PTR(type)[0]) {
case 'd': case 'x': case 'o': case 'X': break;
case 'd': case 'x': case 'o': case 'X':
n = NUM2INT(num);
break;
case 's':
s = StringValueCStr(num);
break;
default: rb_raise(rb_eArgError, "wrong conversion(%c)", cnv);
}
n = NUM2INT(num);
*p++ = '%';
if (!NIL_P(opt)) {
VALUE v;
@ -84,8 +89,13 @@ printf_test_call(int argc, VALUE *argv, VALUE self)
}
*p++ = cnv;
*p++ = '\0';
return rb_assoc_new(rb_enc_sprintf(rb_usascii_encoding(), format, n),
rb_usascii_str_new_cstr(format));
if (cnv == 's') {
result = rb_enc_sprintf(rb_usascii_encoding(), format, s);
}
else {
result = rb_enc_sprintf(rb_usascii_encoding(), format, n);
}
return rb_assoc_new(result, rb_usascii_str_new_cstr(format));
}
void