~ubuntu-branches/ubuntu/wily/ruby2.2/wily-proposed

« back to all changes in this revision

Viewing changes to vm_eval.c

  • Committer: Package Import Robot
  • Author(s): Antonio Terceiro
  • Date: 2015-05-03 18:56:32 UTC
  • mfrom: (1.1.1)
  • Revision ID: package-import@ubuntu.com-20150503185632-kbjmakqdg20vt677
Tags: 2.2.2-1
* New upstream release
  - includes fix for vulnerability with overly permissive matching of
    hostnames in OpenSSL extension [CVE-2015-1855]
* debian/rules: add import-orig-source to automate importing orig tarballs
  generated from the upstream git mirror.
* debian/tests: add a functional test that will run all tests under test/

Show diffs side-by-side

added added

removed removed

Lines of Context:
273
273
        rb_bug("vm_call_super: should not be reached");
274
274
    }
275
275
 
276
 
    klass = RCLASS_SUPER(cfp->klass);
 
276
    klass = RCLASS_ORIGIN(cfp->klass);
 
277
    klass = RCLASS_SUPER(klass);
277
278
    id = cfp->me->def->original_id;
278
279
    me = rb_method_entry(klass, id, &klass);
279
280
    if (!me) {