ruby-changes:67606
From: nagachika <ko1@a...>
Date: Sun, 5 Sep 2021 16:17:44 +0900 (JST)
Subject: [ruby-changes:67606] 7b4bc89394 (ruby_3_0): merge revision(s) 7d22060c14895bbca3ff962e5456384095b66738: [Backport #17609]
https://git.ruby-lang.org/ruby.git/commit/?id=7b4bc89394 From 7b4bc893941b146565c396606effb5f16aa9e88d Mon Sep 17 00:00:00 2001 From: nagachika <nagachika@r...> Date: Sun, 5 Sep 2021 16:17:25 +0900 Subject: merge revision(s) 7d22060c14895bbca3ff962e5456384095b66738: [Backport #17609] addr2line.c: DW_LNS_fixed_advance_pc takes a single uhalf operand Fixes [Bug #17609] Co-Authored-By: xtkoba (Tee KOBAYASHI) <xtkoba+ruby@g...> --- addr2line.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- addr2line.c | 3 ++- version.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/addr2line.c b/addr2line.c index 9669427..2095591 100644 --- a/addr2line.c +++ b/addr2line.c @@ -437,7 +437,8 @@ parse_debug_line_cu(int num_traces, void **traces, char **debug_line, https://github.com/ruby/ruby/blob/trunk/addr2line.c#L437 addr += a; break; case DW_LNS_fixed_advance_pc: - a = *(unsigned char *)p++; + a = *(uint16_t *)p; + p += sizeof(uint16_t); addr += a; break; case DW_LNS_set_prologue_end: diff --git a/version.h b/version.h index b34bdf0..b314a89 100644 --- a/version.h +++ b/version.h @@ -12,7 +12,7 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L12 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 3 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 129 +#define RUBY_PATCHLEVEL 130 #define RUBY_RELEASE_YEAR 2021 #define RUBY_RELEASE_MONTH 9 -- cgit v1.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/