From c74dc8b4af4ef1b32f65587f083fbeba4ca186fa Mon Sep 17 00:00:00 2001 From: HParker Date: Fri, 29 Sep 2023 14:06:26 -0700 Subject: Use reference counting to avoid memory leak in kwargs Tracks other callinfo that references the same kwargs and frees them when all references are cleared. [bug #19906] Co-authored-by: Peter Zhu --- vm_callinfo.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'vm_callinfo.h') diff --git a/vm_callinfo.h b/vm_callinfo.h index 91c92854d7..fb6998b8b3 100644 --- a/vm_callinfo.h +++ b/vm_callinfo.h @@ -43,6 +43,7 @@ enum vm_call_flag_bits { struct rb_callinfo_kwarg { int keyword_len; + int references; VALUE keywords[]; }; @@ -199,6 +200,9 @@ vm_ci_dump(const struct rb_callinfo *ci) static inline const struct rb_callinfo * vm_ci_new_(ID mid, unsigned int flag, unsigned int argc, const struct rb_callinfo_kwarg *kwarg, const char *file, int line) { + if (kwarg) { + ((struct rb_callinfo_kwarg *)kwarg)->references++; + } if (USE_EMBED_CI && VM_CI_EMBEDDABLE_P(mid, flag, argc, kwarg)) { RB_DEBUG_COUNTER_INC(ci_packed); return vm_ci_new_id(mid, flag, argc, kwarg); -- cgit v1.2.3