Skip to content

Commit ce66e31

Browse files
authored
Merge pull request jruby#9285 from headius/trivial_dir_glob_kwargs_fix
Clear callInfo so it does not taint other calls
2 parents 68c52f9 + f59b7e9 commit ce66e31

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

core/src/main/java/org/jruby/RubyDir.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,9 @@ private static class GlobOptions {
234234
private static void globOptions(ThreadContext context, IRubyObject[] args, String[] keys, GlobOptions options) {
235235
Ruby runtime = context.runtime;
236236

237+
// just clear callInfo for now; future PR will handle it appropriately
238+
ThreadContext.resetCallInfo(context);
239+
237240
if (args.length > 1) {
238241
IRubyObject tmp = TypeConverter.checkHashType(runtime, args[args.length - 1]);
239242
boolean processFlags = keys == BASE_FLAGS_KEYWORDS;

0 commit comments

Comments
 (0)