diff options
| author | Nobuyoshi Nakada <[email protected]> | 2019-10-05 02:08:07 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <[email protected]> | 2019-10-05 03:02:09 +0900 |
| commit | cbbe198c89fa25a80ec0a5f0592ea00132eacd01 () | |
| tree | 3913c6ed543ca51f23c1f38a810da647f8c5563d /internal.h | |
| parent | c8a18e25c1cc9a44231b97e12f30a98cf9d979bb (diff) | |
Fix potential memory s by `rb_imemo_tmpbuf_auto_free_pointer`
This function has been used wrongly always at first, "allocate a buffer then wrap it with tmpbuf". This order can cause a memory , as tmpbuf creation also can raise a NoMemoryError exception. The right order is "create a tmpbuf then allocate&wrap a buffer". So the argument of this function is rather harmful than just useless. TODO: * Rename this function to more proper name, as it is not used "temporary" (function local) purpose. * Allocate and wrap at once safely, like `ALLOCV`.
| -rw-r--r-- | internal.h | 12 |
1 files changed, 10 insertions, 2 deletions
@@ -1134,6 +1134,8 @@ imemo_type_p(VALUE imemo, enum imemo_type imemo_type) } } /* FL_USER0 to FL_USER3 is for type */ #define IMEMO_FL_USHIFT (FL_USHIFT + 4) #define IMEMO_FL_USER0 FL_USER4 @@ -1203,13 +1205,19 @@ typedef struct rb_imemo_tmpbuf_struct { size_t cnt; /* buffer size in VALUE */ } rb_imemo_tmpbuf_t; -VALUE rb_imemo_tmpbuf_auto_free_pointer(void *buf); VALUE rb_imemo_tmpbuf_auto_free_maybe_mark_buffer(void *buf, size_t cnt); rb_imemo_tmpbuf_t *rb_imemo_tmpbuf_parser_heap(void *buf, rb_imemo_tmpbuf_t *old_heap, size_t cnt); #define RB_IMEMO_TMPBUF_PTR(v) \ ((void *)(((const struct rb_imemo_tmpbuf_struct *)(v))->ptr)) static inline VALUE rb_imemo_tmpbuf_auto_free_pointer_new_from_an_RString(VALUE str) { @@ -1221,7 +1229,7 @@ rb_imemo_tmpbuf_auto_free_pointer_new_from_an_RString(VALUE str) SafeStringValue(str); /* create tmpbuf to keep the pointer before xmalloc */ - imemo = rb_imemo_tmpbuf_auto_free_pointer(NULL); tmpbuf = (rb_imemo_tmpbuf_t *)imemo; len = RSTRING_LEN(str); src = RSTRING_PTR(str); |