diff options
| author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-07-05 19:06:18 +0000 |
|---|---|---|
| committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-07-05 19:06:18 +0000 |
| commit | 7182c0005c62d167770bb318dbc202e3d474a3dc (patch) | |
| tree | cb28835d2464075c00c0cc60c2c0d75f7a07fd7a | |
| parent | e57bc077f330d81b5870d214087beb939062f2e8 (diff) | |
* ext/zlib/zlib.c (zstream_expand_buffer_without_gvl): Use
ruby_xrealloc() to avoid crash with CALC_EXACT_MALLOC_SIZE.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36325 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/zlib/zlib.c | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Fri Jul 6 04:05:59 2012 Eric Hodel <drbrain@segment7.net> + + * 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@ruby-lang.org> * internal.h: move ThreadShield declarations from intern.h. diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index 73f3f7c5f0..1b651d1c08 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -679,7 +679,7 @@ zstream_expand_buffer_without_gvl(struct zstream *z) 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; |