* eval.c (rb_mod_modfunc): should follow NODE_ZSUPER link; based

  on Guy Decoux's patch in [ruby-talk:25478].

* string.c (rb_str_succ): there was buffer overrun.

* parse.y (str_extend): term can be any character.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@1847 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 11 insertions, 3 deletions

diff --git a/eval.c b/eval.c
index e2cf75913..d1b832249 100644
--- a/eval.c
+++ b/eval.c
@@ -5679,10 +5679,18 @@ rb_mod_modfunc(argc, argv, module)
 
     set_method_visibility(module, argc, argv, NOEX_PRIVATE);
     for (i=0; i<argc; i++) {
+	VALUE m = module;
+
 	id = rb_to_id(argv[i]);
-	body = search_method(module, id, 0);
-	if (body == 0 || body->nd_body == 0) {
-	    rb_bug("undefined method `%s'; can't happen", rb_id2name(id));
+	for (;;) {
+	    body = search_method(m, id, &m);
+	    if (body == 0 || body->nd_body == 0) {
+		rb_bug("undefined method `%s'; can't happen", rb_id2name(id));
+	    }
+	    if (nd_type(body->nd_body) != NODE_ZSUPER) {
+		break;		/* normal case: need not to follow 'super' link */
+	    }
+	    m = RCLASS(m)->super;
 	}
 	rb_add_method(rb_singleton_class(module), id, body->nd_body, NOEX_PUBLIC);
 	rb_clear_cache_by_id(id);