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

vsnprintf.c: fix string precision

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/trunk@46098 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-05-25 02:56:36 +00:00
parent 7833e69c2e
commit bae87a4790
4 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Sun May 25 11:56:33 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* 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]
Sun May 25 11:32:42 2014 Zachary Scott <e@zzak.io> Sun May 25 11:32:42 2014 Zachary Scott <e@zzak.io>
* lib/yaml.rb: Remove Psych::EngineManager [Bug #8344] * lib/yaml.rb: Remove Psych::EngineManager [Bug #8344]

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

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

6
test/-ext-/test_printf.rb
View File

@ -181,4 +181,10 @@ class Test_SPrintf < Test::Unit::TestCase
zero: zr, width: width, zero: zr, width: width,
prec: prec)) prec: prec))
} }
def test_string_prec
assert_equal("a", Bug::Printf.("s", "a", prec: 3)[0])
assert_equal(" a", Bug::Printf.("s", "a", width: 3, prec: 3)[0])
assert_equal("a ", Bug::Printf.("s", "a", minus: true, width: 3, prec: 3)[0])
end
end end

2
vsnprintf.c
View File

@ -993,7 +993,7 @@ fp_begin: _double = va_arg(ap, double);
*/ */
const char *p = (char *)memchr(cp, 0, prec); const char *p = (char *)memchr(cp, 0, prec);
if (p != NULL && (p - cp) > prec) if (p != NULL && (p - cp) < prec)
size = (int)(p - cp); size = (int)(p - cp);
else else
size = prec; size = prec;