https://git.ruby-lang.org/ruby.git/commit/?id=0fd9588395

From 0fd9588395294ac97a1f6dc3a51d4f19e84a6ba9 Mon Sep 17 00:00:00 2001
From: NAKAMURA Usaku <usa@r...>
Date: Wed, 24 Nov 2021 19:31:06 +0900
Subject: merge revision(s) d795f494a89e0d9498dfedc54b8a98acc2bc4d7b: [Backport
 #17794]

	Avoid `free(3)`ing invalid pointer

	Fixes [Bug #17794]
	---
	 addr2line.c | 2 ++
	 1 file changed, 2 insertions(+)
---
 addr2line.c | 2 ++
 version.h   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/addr2line.c b/addr2line.c
index 635194b96be..283382f51da 100644
--- a/addr2line.c
+++ b/addr2line.c
@@ -1585,6 +1585,7 @@ debug_info_read(DebugInfoReader *reader, int num_traces, void **traces, https://github.com/ruby/ruby/blob/trunk/addr2line.c#L1585
 static unsigned long
 uncompress_debug_section(ElfW(Shdr) *shdr, char *file, char **ptr)
 {
+    *ptr = NULL;
 #ifdef SUPPORT_COMPRESSED_DEBUG_LINE
     ElfW(Chdr) *chdr = (ElfW(Chdr) *)(file + shdr->sh_offset);
     unsigned long destsize = chdr->ch_size;
@@ -1605,6 +1606,7 @@ uncompress_debug_section(ElfW(Shdr) *shdr, char *file, char **ptr) https://github.com/ruby/ruby/blob/trunk/addr2line.c#L1606
 
 fail:
     free(*ptr);
+    *ptr = NULL;
 #endif
     return 0;
 }
diff --git a/version.h b/version.h
index ffcb0a7230a..242f9855117 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L2
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 5
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 195
+#define RUBY_PATCHLEVEL 196
 
 #define RUBY_RELEASE_YEAR 2021
 #define RUBY_RELEASE_MONTH 11
-- 
cgit v1.2.1


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