diff options
| author | nagachika <nagachika@ruby-lang.org> | 2023-07-16 16:42:12 +0900 |
|---|---|---|
| committer | nagachika <nagachika@ruby-lang.org> | 2023-07-16 16:42:12 +0900 |
| commit | c13757ed9ae02a2d03aea91bb852397aa920f3fd (patch) | |
| tree | 7020db60e186213719a39e968d29be9479518e7c /io_buffer.c | |
| parent | 141402d11c09fa641eebd8f4841f81e7bbf3518c (diff) | |
merge revision(s) 09295ea796900fb7b05d29e93364090e21598566: [Backport #19543]
IO::Buffer#resize: Free internal buffer if new size is zero (#7569)
`#resize(0)` on an IO::Buffer with internal buffer allocated will
result in calling `realloc(data->base, 0)`. The behavior of `realloc`
with size = 0 is implementation-defined (glibc frees the object
and returns NULL, while BSDs return an inaccessible object). And
thus such usage is deprecated in standard C (upcoming C23 will make it
UB).
To avoid this problem, just `free`s the memory when the new size is zero.
---
io_buffer.c | 5 +++++
test/ruby/test_io_buffer.rb | 18 ++++++++++++++++++
2 files changed, 23 insertions(+)
Diffstat (limited to 'io_buffer.c')
| -rw-r--r-- | io_buffer.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/io_buffer.c b/io_buffer.c index 6a6bc25628..1fa6473328 100644 --- a/io_buffer.c +++ b/io_buffer.c @@ -1391,6 +1391,11 @@ rb_io_buffer_resize(VALUE self, size_t size) #endif if (data->flags & RB_IO_BUFFER_INTERNAL) { + if (size == 0) { + io_buffer_free(data); + return; + } + void *base = realloc(data->base, size); if (!base) { |