summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNARUSE, Yui <naruse@airemix.jp>2021-02-03 00:33:47 +0900
committerNARUSE, Yui <naruse@airemix.jp>2021-02-03 00:33:47 +0900
commit0c6361ff28528181e8436aff1f6e045759d8e32d (patch)
tree7e0c1bc43e0cc0e7fe5cea8f80599db9fb8b706b
parent03c50eb0db82afc528f1eaf53b5fd55423449f04 (diff)
merge revision(s) 0e5fbec81632968836da06dc50fca4948cae6d30: [Backport #17603]
Fixed varargs in `rb_bug_without_die` [Bug #17603] --- error.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
-rw-r--r--error.c4
-rw-r--r--version.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/error.c b/error.c
index 5d8cb82b62..d1dfd03a9d 100644
--- a/error.c
+++ b/error.c
@@ -751,7 +751,7 @@ die(void)
}
void
-rb_bug_without_die(const char *fmt, ...)
+rb_bug_without_die(const char *fmt, va_list args)
{
const char *file = NULL;
int line = 0;
@@ -760,7 +760,7 @@ rb_bug_without_die(const char *fmt, ...)
file = rb_source_location_cstr(&line);
}
- report_bug(file, line, fmt, NULL);
+ report_bug_valist(file, line, fmt, NULL, args);
}
void
diff --git a/version.h b/version.h
index e40891fa06..c85c9388df 100644
--- a/version.h
+++ b/version.h
@@ -12,7 +12,7 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 37
+#define RUBY_PATCHLEVEL 38
#define RUBY_RELEASE_YEAR 2021
#define RUBY_RELEASE_MONTH 2