drbrain	2012-07-06 04:06:18 +0900 (Fri, 06 Jul 2012)

  New Revision: 36325

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

  Log:
    * ext/zlib/zlib.c (zstream_expand_buffer_without_gvl):  Use
      ruby_xrealloc() to avoid crash with CALC_EXACT_MALLOC_SIZE.

  Modified files:
    trunk/ChangeLog
    trunk/ext/zlib/zlib.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 36324)
+++ ChangeLog	(revision 36325)
@@ -1,3 +1,8 @@
+Fri Jul  6 04:05:59 2012  Eric Hodel  <drbrain@s...>
+
+	* ext/zlib/zlib.c (zstream_expand_buffer_without_gvl):  Use
+	  ruby_xrealloc() to avoid crash with CALC_EXACT_MALLOC_SIZE.
+
 Thu Jul  5 17:32:19 2012  Nobuyoshi Nakada  <nobu@r...>
 
 	* internal.h: move ThreadShield declarations from intern.h.
Index: ext/zlib/zlib.c
===================================================================
--- ext/zlib/zlib.c	(revision 36324)
+++ ext/zlib/zlib.c	(revision 36325)
@@ -679,7 +679,7 @@
 
 	len = z->buf_filled + inc;
 
-	new_str = realloc(RSTRING(z->buf)->as.heap.ptr, len + 1);
+	new_str = ruby_xrealloc(RSTRING(z->buf)->as.heap.ptr, len + 1);
 
 	if (!new_str)
 	    return 0;

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