1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

merge revision(s) d795f494a8: [Backport #17794]

Avoid `free(3)`ing invalid pointer

	Fixes [Bug #17794]
	---
	 addr2line.c | 2 ++
	 1 file changed, 2 insertions(+)
This commit is contained in:
nagachika 2021-09-11 13:52:43 +09:00
parent 7b4bc89394
commit 8e4ed4ed00
2 changed files with 4 additions and 2 deletions

View file

@ -1626,6 +1626,7 @@ debug_info_read(DebugInfoReader *reader, int num_traces, void **traces,
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;
@ -1646,6 +1647,7 @@ uncompress_debug_section(ElfW(Shdr) *shdr, char *file, char **ptr)
fail:
free(*ptr);
*ptr = NULL;
#endif
return 0;
}

View file

@ -12,11 +12,11 @@
# 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 130
#define RUBY_PATCHLEVEL 131
#define RUBY_RELEASE_YEAR 2021
#define RUBY_RELEASE_MONTH 9
#define RUBY_RELEASE_DAY 5
#define RUBY_RELEASE_DAY 11
#include "ruby/version.h"