archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merges r30595 from trunk into ruby_1_9_2.

Browse source 
--
* vsnprintf.c (cvt): set first byte of buf to NUL for the case when
  no bytes are written to the buf. [ruby-dev:43062]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30688 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2011-01-28 02:25:18 +00:00
parent baac6078e3
commit aeb3ba1e58
3 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Wed Jan 19 02:54:04 2011 NARUSE, Yui <naruse@ruby-lang.org>
* vsnprintf.c (cvt): set first byte of buf to NUL for the case when
no bytes are written to the buf. [ruby-dev:43062]
Tue Jan 18 02:46:55 2011 Aaron Patterson <aaron@tenderlovemaking.com> Tue Jan 18 02:46:55 2011 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/psych/lib/psych/visitors/json_tree.rb (visit_String): JSON * ext/psych/lib/psych/visitors/json_tree.rb (visit_String): JSON

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2" #define RUBY_VERSION "1.9.2"
#define RUBY_PATCHLEVEL 165 #define RUBY_PATCHLEVEL 166
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1

1
vsnprintf.c
View file

@ -1165,6 +1165,7 @@ cvt(value, ndigits, flags, sign, decpt, ch, length, buf)
else { else {
digits = BSD__dtoa(value, mode, ndigits, decpt, &dsgn, &rve); digits = BSD__dtoa(value, mode, ndigits, decpt, &dsgn, &rve);
} }
buf[0] = 0; /* rve - digits may be 0 */
memcpy(buf, digits, rve - digits); memcpy(buf, digits, rve - digits);
xfree(digits); xfree(digits);
rve = buf + (rve - digits); rve = buf + (rve - digits);