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

merges r27694 from trunk into ruby_1_9_2.

Browse source 
--
* ext/json/generator/generator.c (fbuffer_inc_capa):
  fix tha use of REALLOC_N. [ruby-dev:41227]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@27699 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2010-05-09 03:10:24 +00:00
parent a190fa4fff
commit b86cfcde18
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sun May 9 08:32:56 2010 NARUSE, Yui <naruse@ruby-lang.org>
* ext/json/generator/generator.c (fbuffer_inc_capa):
fix tha use of REALLOC_N. [ruby-dev:41227]
Sun May 9 09:15:03 2010 Shugo Maeda <shugo@ruby-lang.org> Sun May 9 09:15:03 2010 Shugo Maeda <shugo@ruby-lang.org>
* test/net/imap/test_imap.rb: use IPv4 for * test/net/imap/test_imap.rb: use IPv4 for

2
ext/json/generator/generator.c
View file

@ -339,7 +339,7 @@ static void fbuffer_inc_capa(FBuffer *fb, unsigned int requested)
for (required = fb->capa; requested > required - fb->len; required <<= 1); for (required = fb->capa; requested > required - fb->len; required <<= 1);
if (required > fb->capa) { if (required > fb->capa) {
fb->ptr = (char *) REALLOC_N((long*) fb->ptr, char, required); REALLOC_N(fb->ptr, char, required);
fb->capa = required; fb->capa = required;
} }
} }