Backtrace-limit option in command line have precedence over RUBYOPT

nobu · Aug 10, 2023 · bcabaaa · bcabaaa
1 parent f702db0
commit bcabaaa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/ruby.c b/ruby.c
@@ -217,7 +217,7 @@ cmdline_options_init(ruby_cmdline_options_t *opt)
 #elif defined(YJIT_FORCE_ENABLE)
     opt->features.set |= FEATURE_BIT(yjit);
 #endif
-    opt->backtrace_length_limit = -1;
+    opt->backtrace_length_limit = -2; /* invalid value */
 
     return opt;
 }
@@ -893,7 +893,6 @@ 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;
-    int backtrace_length_limit = opt->backtrace_length_limit;
 
     while (ISSPACE(*s)) s++;
     if (!*s) return;
@@ -944,9 +943,6 @@ 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 >= 0) {
-        opt->backtrace_length_limit = backtrace_length_limit;
-    }
 
     ruby_xfree(ptr);
     /* get rid of GC */
@@ -1453,7 +1449,9 @@ proc_long_options(ruby_cmdline_options_t *opt, const char *s, long argc, char **
         if (errno == ERANGE || n < -1 || n > INT_MAX || *e) {
             rb_raise(rb_eRuntimeError, "wrong limit for backtrace length");
         }
-        opt->backtrace_length_limit = (int)n;
+        else if (opt->backtrace_length_limit < -1) {
+            opt->backtrace_length_limit = (int)n;
+        }
     }
     else {
         rb_raise(rb_eRuntimeError,

diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb
@@ -88,6 +88,7 @@ def test_backtrace_limit
     env = {"RUBYOPT" => "--backtrace-limit=5"}
     assert_in_out_err([env], "p Thread::Backtrace.limit", ['5'], [])
     assert_in_out_err([env, "--backtrace-limit=1"], "p Thread::Backtrace.limit", ['1'], [])
+    assert_in_out_err([env, "--backtrace-limit=-1"], "p Thread::Backtrace.limit", ['-1'], [])
     if (int_max = RbConfig::LIMITS["INT_MAX"]) < RbConfig::LIMITS["LONG_MAX"]
       assert_in_out_err(%W(--backtrace-limit=#{int_max+1}), "p Thread::Backtrace.limit",
                         [], /wrong limit for backtrace length/)