Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: db207c1fcccb
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e521bf333e56
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 7, 2017

  1. Don't allow null method names

    Solves #4426
    retoo committed Jan 7, 2017
    Copy the full SHA
    567c11c View commit details
  2. Merge pull request #4427 from retoo/fix-super-npe

    Don't allow null method names
    kares authored Jan 7, 2017
    Copy the full SHA
    e521bf3 View commit details
Showing with 3 additions and 2 deletions.
  1. +3 −2 core/src/main/java/org/jruby/runtime/Helpers.java
5 changes: 3 additions & 2 deletions core/src/main/java/org/jruby/runtime/Helpers.java
Original file line number Diff line number Diff line change
@@ -990,10 +990,11 @@ public static void checkSuperDisabledOrOutOfMethod(ThreadContext context, RubyMo
if (klass == null) {
if (name != null) {
throw context.runtime.newNameError("superclass method '" + name + "' disabled", name);
} else {
throw context.runtime.newNoMethodError("super called outside of method", null, context.nil);
}
}
if (name == null) {
throw context.runtime.newNoMethodError("super called outside of method", null, context.nil);
}
}

public static Block ensureSuperBlock(Block given, Block parent) {