diff options
Diffstat (limited to 'marshal.c')
-rw-r--r-- | marshal.c | 16 |
1 files changed, 15 insertions, 1 deletions
@@ -178,8 +178,22 @@ check_dump_arg(VALUE ret, struct dump_arg *arg, const char *name) } return ret; } + +static VALUE +check_userdump_arg(VALUE obj, ID sym, int argc, const VALUE *argv, + struct dump_arg *arg, const char *name) +{ + VALUE ret = rb_funcallv(obj, sym, argc, argv); + VALUE klass = CLASS_OF(obj); + if (CLASS_OF(ret) == klass) { + rb_raise(rb_eRuntimeError, "%"PRIsVALUE"#%s returned same class instance", + klass, name); + } + return check_dump_arg(ret, arg, name); +} + #define dump_funcall(arg, obj, sym, argc, argv) \ - check_dump_arg(rb_funcallv(obj, sym, argc, argv), arg, name_##sym) + check_userdump_arg(obj, sym, argc, argv, arg, name_##sym) #define dump_check_funcall(arg, obj, sym, argc, argv) \ check_dump_arg(rb_check_funcall(obj, sym, argc, argv), arg, name_##sym) |