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

ruby-changes:67511

From: Nobuyoshi <ko1@a...>
Date: Tue, 31 Aug 2021 23:25:49 +0900 (JST)
Subject: [ruby-changes:67511] 31c427511c (master): [ruby/zlib] Revert "Don't print out warnings when freeing."

https://git.ruby-lang.org/ruby.git/commit/?id=31c427511c

From 31c427511c71f9491697cbdfc02731ad04ea57c6 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Tue, 31 Aug 2021 22:27:49 +0900
Subject: [ruby/zlib] Revert "Don't print out warnings when freeing."

https://github.com/ruby/zlib/commit/931aa7a272
---
 ext/zlib/zlib.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index b129e2e..794cf3b 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -1226,6 +1226,17 @@ zstream_finalize(struct zstream *z) https://github.com/ruby/ruby/blob/trunk/ext/zlib/zlib.c#L1226
 	finalizer_warn("the stream was freed prematurely.");
 }
 
+static void
+zstream_free(void *p)
+{
+    struct zstream *z = p;
+
+    if (ZSTREAM_IS_READY(z)) {
+	zstream_finalize(z);
+    }
+    xfree(z);
+}
+
 static size_t
 zstream_memsize(const void *p)
 {
@@ -1235,7 +1246,7 @@ zstream_memsize(const void *p) https://github.com/ruby/ruby/blob/trunk/ext/zlib/zlib.c#L1246
 
 static const rb_data_type_t zstream_data_type = {
     "zstream",
-    { zstream_mark, xfree, zstream_memsize, },
+    { zstream_mark, zstream_free, zstream_memsize, },
      0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
-- 
cgit v1.1


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

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