1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change rb_darray_realloc_mul_add_without_gc to check for overflow

Browse Source
This commit is contained in:
Peter Zhu 2024-12-24 17:52:32 -05:00
parent e596516182
commit bd70534e97
Notes: git 2025-01-02 16:03:24 +00:00 
Merged: https://github.com/ruby/ruby/pull/12459
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
darray.h
View File

@ -187,12 +187,11 @@ rb_darray_calloc_mul_add_without_gc(size_t x, size_t y, size_t z)
return ptr; return ptr;
} }
/* Internal function. Like rb_xrealloc_mul_add but does not trigger GC and does /* Internal function. Like rb_xrealloc_mul_add but does not trigger GC. */
* not check for overflow in arithmetic. */
static inline void * static inline void *
rb_darray_realloc_mul_add_without_gc(const void *orig_ptr, size_t x, size_t y, size_t z) rb_darray_realloc_mul_add_without_gc(const void *orig_ptr, size_t x, size_t y, size_t z)
{ {
size_t size = (x * y) + z; size_t size = rbimpl_size_add_or_raise(rbimpl_size_mul_or_raise(x, y), z);
void *ptr = realloc((void *)orig_ptr, size); void *ptr = realloc((void *)orig_ptr, size);
if (ptr == NULL) rb_bug("rb_darray_realloc_mul_add_without_gc: failed"); if (ptr == NULL) rb_bug("rb_darray_realloc_mul_add_without_gc: failed");