yugui	2010-05-09 12:10:24 +0900 (Sun, 09 May 2010)

  New Revision: 27699

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=27699

  Log:
    merges r27694 from trunk into ruby_1_9_2.
    --
    * ext/json/generator/generator.c (fbuffer_inc_capa):
      fix tha use of REALLOC_N. [ruby-dev:41227]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/ext/json/generator/generator.c

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 27698)
+++ ruby_1_9_2/ChangeLog	(revision 27699)
@@ -1,3 +1,8 @@
+Sun May  9 08:32:56 2010  NARUSE, Yui  <naruse@r...>
+
+	* 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@r...>
 
 	* test/net/imap/test_imap.rb: use IPv4 for
Index: ruby_1_9_2/ext/json/generator/generator.c
===================================================================
--- ruby_1_9_2/ext/json/generator/generator.c	(revision 27698)
+++ ruby_1_9_2/ext/json/generator/generator.c	(revision 27699)
@@ -339,7 +339,7 @@
     for (required = fb->capa; requested > required - fb->len; required <<= 1);
 
     if (required > fb->capa) {
-        fb->ptr = (char *) REALLOC_N((long*) fb->ptr, char, required);
+        REALLOC_N(fb->ptr, char, required);
         fb->capa = required;
     }
 }

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/