archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix the precedence of --backtrace-limit option

Browse source 
In general, if the same option specifying a single value is given
multiple times at the same level, the last one overrides the earlier
ones, unless prohibited.
This commit is contained in:
Nobuyoshi Nakada 2023-08-13 01:00:16 +09:00
parent 546c5cfe4c
commit b56e5c6b94
Notes: git 2025-05-14 12:41:59 +00:00
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ruby.c
View file

@ -897,6 +897,7 @@ moreswitches(const char *s, ruby_cmdline_options_t *opt, int envopt)
VALUE int_enc_name = opt->intern.enc.name;
ruby_features_t feat = opt->features;
ruby_features_t warn = opt->warn;
long backtrace_length_limit = opt->backtrace_length_limit;
while (ISSPACE(*s)) s++;
if (!*s) return;
@ -947,6 +948,9 @@ moreswitches(const char *s, ruby_cmdline_options_t *opt, int envopt)
}
FEATURE_SET_RESTORE(opt->features, feat);
FEATURE_SET_RESTORE(opt->warn, warn);
if (BACKTRACE_LENGTH_LIMIT_VALID_P(backtrace_length_limit)) {
opt->backtrace_length_limit = backtrace_length_limit;
}
ruby_xfree(ptr);
/* get rid of GC */
@ -1453,7 +1457,7 @@ proc_long_options(ruby_cmdline_options_t *opt, const char *s, long argc, char **
if (errno == ERANGE || !BACKTRACE_LENGTH_LIMIT_VALID_P(n) || *e) {
rb_raise(rb_eRuntimeError, "wrong limit for backtrace length");
}
else if (!OPT_BACKTRACE_LENGTH_LIMIT_VALID_P(opt)) {
else {
opt->backtrace_length_limit = n;
}
}