diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2021-01-02 12:11:52 +0900 |
|---|---|---|
| committer | NARUSE, Yui <naruse@airemix.jp> | 2021-01-13 17:07:17 +0900 |
| commit | 5b2a0fc682ce69e2b95532ce1116dcb32e6aa011 (patch) | |
| tree | 647fd01785a1a1684fcb77cdd2157c21054053ab | |
| parent | 1614dd9fd44e27aa5afc6de94602ac7292962d11 (diff) | |
Fixed dangling imemo_tmpbuf
The count of rb_alloc_tmp_buffer_with_count is the allocation size
counted in VALUE size but not in the requested element size.
Co-authored-by: Yusuke Endoh <mame@ruby-lang.org>
Co-authored-by: Koichi Sasada <ko1@atdot.net>
| -rw-r--r-- | include/ruby/internal/memory.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/ruby/internal/memory.h b/include/ruby/internal/memory.h index 974c21e19c..7d24df4945 100644 --- a/include/ruby/internal/memory.h +++ b/include/ruby/internal/memory.h @@ -250,8 +250,9 @@ rbimpl_size_mul_or_raise(size_t x, size_t y) static inline void * rb_alloc_tmp_buffer2(volatile VALUE *store, long count, size_t elsize) { - return rb_alloc_tmp_buffer_with_count( - store, rbimpl_size_mul_or_raise(count, elsize), count); + const size_t total_size = rbimpl_size_mul_or_raise(count, elsize); + const size_t cnt = (total_size + sizeof(VALUE) - 1) / sizeof(VALUE); + return rb_alloc_tmp_buffer_with_count(store, total_size, cnt); } #ifndef __MINGW32__ |