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

* sprintf.c (rb_str_format): Fix a dynamic format string.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41248 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2013-06-12 03:09:28 +00:00
parent 7fa5e608d3
commit 174e3fb6e4
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Wed Jun 12 12:07:04 2013 Tanaka Akira <akr@fsij.org>
* sprintf.c (rb_str_format): Fix a dynamic format string.
Wed Jun 12 12:04:09 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed Jun 12 12:04:09 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* array.c (rb_ary_uniq_bang): must not be modified once frozen even in * array.c (rb_ary_uniq_bang): must not be modified once frozen even in

9
sprintf.c
View File

@ -734,7 +734,7 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
{ {
volatile VALUE val = GETARG(); volatile VALUE val = GETARG();
int valsign; int valsign;
char fbuf[32], nbuf[64], *s; char nbuf[64], *s;
const char *prefix = 0; const char *prefix = 0;
int sign = 0, dots = 0; int sign = 0, dots = 0;
char sc = 0; char sc = 0;
@ -866,8 +866,6 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
len = rb_long2int(RSTRING_END(tmp) - s); len = rb_long2int(RSTRING_END(tmp) - s);
} }
else if (!bignum) { else if (!bignum) {
char c = *p;
if (c == 'i') c = 'd'; /* %d and %i are identical */
valsign = 1; valsign = 1;
if (v < 0) { if (v < 0) {
v = -v; v = -v;
@ -883,13 +881,12 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
sc = ' '; sc = ' ';
width--; width--;
} }
snprintf(fbuf, sizeof(fbuf), "%%l%c", c); snprintf(nbuf, sizeof(nbuf), "%ld", v);
snprintf(nbuf, sizeof(nbuf), fbuf, v);
s = nbuf; s = nbuf;
len = (int)strlen(s); len = (int)strlen(s);
} }
else { else {
tmp = rb_big2str(val, base); tmp = rb_big2str(val, 10);
s = RSTRING_PTR(tmp); s = RSTRING_PTR(tmp);
valsign = 1; valsign = 1;
if (s[0] == '-') { if (s[0] == '-') {