summaryrefslogtreecommitdiff
path: root/marshal.c
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-05-27 07:50:04 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-05-27 07:50:04 +0000
commitf4c7c5dc07c4f47b6b222386841d7dfbb40d0234 (patch)
treede6ef20ed8deee8cb4ae8a2603d3d07fecc45d1d /marshal.c
parent588394468c6d5ab5e7f0114d16bcc2cc686a6c1d (diff)
* marshal.c (w_class): should not dump singleton class.
[ruby-dev:22631] * marshal.c (class2path): check anonymous class/module before checking referable, and allow singleton classes. * marshal.c (class2path): get class path and check referable. [ruby-dev:22588] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@6421 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'marshal.c')
-rw-r--r--marshal.c34
1 files changed, 22 insertions, 12 deletions
diff --git a/marshal.c b/marshal.c
index c9e3c74..90c0788 100644
--- a/marshal.c
+++ b/marshal.c
@@ -98,6 +98,24 @@ struct dump_call_arg {
int limit;
};
+static VALUE
+class2path(klass)
+ VALUE klass;
+{
+ VALUE path = rb_class_path(klass);
+ char *n = RSTRING(path)->ptr;
+
+ if (n[0] == '#') {
+ rb_raise(rb_eTypeError, "can't dump anonymous %s %s",
+ (TYPE(klass) == T_CLASS ? "class" : "module"),
+ n);
+ }
+ if (rb_path2class(n) != rb_class_real(klass)) {
+ rb_raise(rb_eTypeError, "%s cannot be referred", n);
+ }
+ return path;
+}
+
static void w_long _((long, struct dump_arg*));
static void
@@ -382,7 +400,7 @@ w_class(type, obj, arg, check)
VALUE klass = CLASS_OF(obj);
w_extended(klass, arg, check);
w_byte(type, arg);
- path = rb_class2name(klass);
+ path = RSTRING(class2path(rb_class_real(klass)))->ptr;
w_unique(path, arg);
}
@@ -397,7 +415,7 @@ w_uclass(obj, base_klass, arg)
klass = rb_class_real(klass);
if (klass != base_klass) {
w_byte(TYPE_UCLASS, arg);
- w_unique(rb_class2name(klass), arg);
+ w_unique(RSTRING(class2path(klass))->ptr, arg);
}
}
@@ -517,11 +535,7 @@ w_object(obj, arg, limit)
}
w_byte(TYPE_CLASS, arg);
{
- VALUE path = rb_class_path(obj);
- if (RSTRING(path)->ptr[0] == '#') {
- rb_raise(rb_eTypeError, "can't dump anonymous class %s",
- RSTRING(path)->ptr);
- }
+ VALUE path = class2path(obj);
w_bytes(RSTRING(path)->ptr, RSTRING(path)->len, arg);
}
break;
@@ -529,11 +543,7 @@ w_object(obj, arg, limit)
case T_MODULE:
w_byte(TYPE_MODULE, arg);
{
- VALUE path = rb_class_path(obj);
- if (RSTRING(path)->ptr[0] == '#') {
- rb_raise(rb_eTypeError, "can't dump anonymous module %s",
- RSTRING(path)->ptr);
- }
+ VALUE path = class2path(obj);
w_bytes(RSTRING(path)->ptr, RSTRING(path)->len, arg);
}
break;