* marshal.c (r_leave): move proc invocation from r_entry() to

  avoid potential crash.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13567 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 4 insertions, 4 deletions

diff --git a/marshal.c b/marshal.c
index f4cc37942e..626a2d0783 100644
--- a/marshal.c
+++ b/marshal.c
@@ -1016,9 +1016,6 @@ r_entry(VALUE v, struct load_arg *arg)
         if ((VALUE)real_obj != Qundef)
             OBJ_TAINT((VALUE)real_obj);
     }
-    if (arg->proc) {
-	v = rb_funcall(arg->proc, rb_intern("call"), 1, v);
-    }
     return v;
 }
 
@@ -1035,7 +1032,10 @@ r_leave(VALUE v, struct load_arg *arg)
             compat->loader(real_obj, v);
         }
         st_delete(arg->compat_tbl, &key, 0);
-        return real_obj;
+        v = real_obj;
+    }
+    if (arg->proc) {
+	v = rb_funcall(arg->proc, rb_intern("call"), 1, v);
     }
     return v;
 }