[前][次][番号順一覧][スレッド一覧]

ruby-changes:56133

From: Nobuyoshi <ko1@a...>
Date: Tue, 18 Jun 2019 13:41:31 +0900 (JST)
Subject: [ruby-changes:56133] Nobuyoshi Nakada: 8b3774be3d (trunk): Fix memory leak

https://git.ruby-lang.org/ruby.git/commit/?id=8b3774be3d

From 8b3774be3dd9f472bddd99e84e3c9fe2ff99d7ac Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Tue, 18 Jun 2019 13:27:05 +0900
Subject: Fix memory leak

* string.c (str_make_independent_expand): free independent buffer.
  [Bug# 15935]

Co-Authored-By: luke-gru (Luke Gruber) <luke.gru@g...>

diff --git a/string.c b/string.c
index e811e8a..fdb7e40 100644
--- a/string.c
+++ b/string.c
@@ -2069,7 +2069,7 @@ static void https://github.com/ruby/ruby/blob/trunk/string.c#L2069
 str_make_independent_expand(VALUE str, long len, long expand, const int termlen)
 {
     char *ptr;
-    const char *oldptr;
+    char *oldptr;
     long capa = len + expand;
 
     if (len > capa) len = capa;
@@ -2088,6 +2088,9 @@ str_make_independent_expand(VALUE str, long len, long expand, const int termlen) https://github.com/ruby/ruby/blob/trunk/string.c#L2088
     if (oldptr) {
 	memcpy(ptr, oldptr, len);
     }
+    if (FL_TEST_RAW(str, STR_NOEMBED|STR_NOFREE|STR_SHARED) == STR_NOEMBED) {
+        xfree(oldptr);
+    }
     STR_SET_NOEMBED(str);
     FL_UNSET(str, STR_SHARED|STR_NOFREE);
     TERM_FILL(ptr + len, termlen);
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]