Skip to content

Fix recent potential NPE reports #8820

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
headius merged 2 commits into from
Apr 30, 2025
Merged

Fix recent potential NPE reports #8820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1b00e2
Don't use null methodEntry for source module
headius Apr 30, 2025
be564f3
_chomp from this form of extract cannot be null
headius Apr 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/RubyModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1707,7 +1707,7 @@ private CacheEntry searchWithCacheMiss(Ruby runtime, final String id, final bool
if (cacheUndef) {
return addToCache(id, UndefinedMethod.getInstance(), this, token);
}
return cacheEntryFactory.newCacheEntry(id, UndefinedMethod.getInstance(), methodEntry.sourceModule, token);
return cacheEntryFactory.newCacheEntry(id, UndefinedMethod.getInstance(), this, token);
} else if (!runtime.isBooting()) {
addToCache(id, methodEntry);
}
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/util/StringSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2073,7 +2073,7 @@ public static IRubyObject rbStrEnumerateLines(RubyString str, ThreadContext cont

if (opts != context.nil) {
IRubyObject _chomp = ArgsUtil.extractKeywordArg(context, "chomp", opts);
chomp = _chomp != null || _chomp.isTrue();
chomp = _chomp.isTrue();
}

if (block.isGiven()) {
Expand Down