Skip to content

Commit

Permalink
* marshal.c (r_object0): remove unnecessary iv restoration for
Browse files Browse the repository at this point in the history 
  USRMARSHAL. [ruby-dev:21582]

* marshal.c (w_object): dump generic instance variables from
  a string from '_dump'.

* variable.c (rb_generic_ivar_table): return 0 if obj's FL_EXIVAR
  is not set.

* time.c (time_dump): copy instance variables to dumped string, to
  be included in the marshaled data.

* bignum.c (rb_big2ulong): add range check to ensure round trip.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4734 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
matz committed Oct 9, 2003
1 parent 80549d5 commit 90a88ab
Show file tree
Hide file tree
Showing 6 changed files with 62 additions and 51 deletions.
19 changes: 16 additions & 3 deletions ChangeLog
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,27 @@ Thu Oct 9 17:43:36 2003 Nobuyoshi Nakada <[email protected]>
* eval.c (proc_save_safe_level, proc_get_safe_level,
proc_set_safe_level): save/restore safe level 1..4.

Thu Oct 9 16:33:23 2003 Yukihiro Matsumoto <[email protected]>

* marshal.c (r_object0): remove unnecessary iv restoration for
USRMARSHAL. [ruby-dev:21582]

* marshal.c (w_object): dump generic instance variables from
a string from '_dump'.

* variable.c (rb_generic_ivar_table): return 0 if obj's FL_EXIVAR
is not set.

* time.c (time_dump): copy instance variables to dumped string, to
be included in the marshaled data.

* bignum.c (rb_big2ulong): add range check to ensure round trip.

Thu Oct 9 15:45:27 2003 Yukihiro Matsumoto <[email protected]>

* pack.c (uv_to_utf8): change message to "out of range", since
negative values are not "too big". [ruby-dev21567]

* marshal.c (w_object): should pass the value of "weak" to
w_object(). [ruby-dev:21555] and [ruby-dev:21561]

Thu Oct 9 14:05:38 2003 Nobuyoshi Nakada <[email protected]>

* eval.c (rb_set_end_proc, rb_exec_end_proc): restore safe level.
Expand Down
7 changes: 6 additions & 1 deletion bignum.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -729,7 +729,12 @@ rb_big2ulong(x)
{
unsigned long num = big2ulong(x, "unsigned long");

if (!RBIGNUM(x)->sign) return -num;
if (!RBIGNUM(x)->sign) {
if ((long)num < 0) {
rb_raise(rb_eRangeError, "bignum out of range of unsigned long");
}
return -num;
}
return num;
}

Expand Down
52 changes: 19 additions & 33 deletions marshal.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ struct dump_call_arg {
VALUE obj;
struct dump_arg *arg;
int limit;
int weak;
};

static void w_long _((long, struct dump_arg*));
Expand Down Expand Up @@ -333,15 +332,15 @@ w_unique(s, arg)
w_symbol(rb_intern(s), arg);
}

static void w_object _((VALUE,struct dump_arg*,int,int));
static void w_object _((VALUE,struct dump_arg*,int));

static int
hash_each(key, value, arg)
VALUE key, value;
struct dump_call_arg *arg;
{
w_object(key, arg->arg, arg->limit, arg->weak);
w_object(value, arg->arg, arg->limit, arg->weak);
w_object(key, arg->arg, arg->limit);
w_object(value, arg->arg, arg->limit);
return ST_CONTINUE;
}

Expand Down Expand Up @@ -404,7 +403,7 @@ w_obj_each(id, value, arg)
struct dump_call_arg *arg;
{
w_symbol(id, arg->arg);
w_object(value, arg->arg, arg->limit, arg->weak);
w_object(value, arg->arg, arg->limit);
return ST_CONTINUE;
}

Expand All @@ -423,11 +422,10 @@ w_ivar(tbl, arg)
}

static void
w_object(obj, arg, limit, weak)
w_object(obj, arg, limit)
VALUE obj;
struct dump_arg *arg;
int limit;
int weak;
{
struct dump_call_arg c_arg;
st_table *ivtbl = 0;
Expand All @@ -439,7 +437,6 @@ w_object(obj, arg, limit, weak)
limit--;
c_arg.limit = limit;
c_arg.arg = arg;
c_arg.weak = weak;

if (ivtbl = rb_generic_ivar_table(obj)) {
w_byte(TYPE_IVAR, arg);
Expand All @@ -463,7 +460,7 @@ w_object(obj, arg, limit, weak)
w_long(FIX2LONG(obj), arg);
}
else {
w_object(rb_int2big(FIX2LONG(obj)), arg, limit, weak);
w_object(rb_int2big(FIX2LONG(obj)), arg, limit);
}
#endif
}
Expand All @@ -485,17 +482,11 @@ w_object(obj, arg, limit, weak)
if (rb_respond_to(obj, s_mdump)) {
VALUE v;

if (TYPE(obj) == T_OBJECT) {
w_byte(TYPE_IVAR, arg);
ivtbl = ROBJECT(obj)->iv_tbl;
}
v = rb_funcall(obj, s_mdump, 0, 0);
w_byte(TYPE_USRMARSHAL, arg);
w_unique(rb_class2name(CLASS_OF(obj)), arg);
w_object(v, arg, limit, weak);
c_arg.weak = Qtrue;
ivtbl = rb_generic_ivar_table(v);
if (ivtbl) w_ivar(ivtbl, &c_arg);
w_object(v, arg, limit);
if (ivtbl) w_ivar(0, &c_arg);
return;
}
if (rb_respond_to(obj, s_dump)) {
Expand All @@ -505,11 +496,14 @@ w_object(obj, arg, limit, weak)
if (TYPE(v) != T_STRING) {
rb_raise(rb_eTypeError, "_dump() must return string");
}
if (!ivtbl && (ivtbl = rb_generic_ivar_table(v))) {
w_byte(TYPE_IVAR, arg);
}
w_class(TYPE_USERDEF, obj, arg);
w_bytes(RSTRING(v)->ptr, RSTRING(v)->len, arg);
c_arg.weak = Qtrue;
ivtbl = rb_generic_ivar_table(v);
if (ivtbl) w_ivar(ivtbl, &c_arg);
if (ivtbl) {
w_ivar(ivtbl, &c_arg);
}
return;
}

Expand Down Expand Up @@ -595,7 +589,7 @@ w_object(obj, arg, limit, weak)

w_long(len, arg);
while (len--) {
w_object(*ptr, arg, limit, weak);
w_object(*ptr, arg, limit);
ptr++;
}
}
Expand All @@ -616,7 +610,7 @@ w_object(obj, arg, limit, weak)
w_long(RHASH(obj)->tbl->num_entries, arg);
st_foreach(RHASH(obj)->tbl, hash_each, (st_data_t)&c_arg);
if (!NIL_P(RHASH(obj)->ifnone)) {
w_object(RHASH(obj)->ifnone, arg, limit, weak);
w_object(RHASH(obj)->ifnone, arg, limit);
}
break;

Expand All @@ -634,7 +628,7 @@ w_object(obj, arg, limit, weak)
}
for (i=0; i<len; i++) {
w_symbol(SYM2ID(RARRAY(mem)->ptr[i]), arg);
w_object(RSTRUCT(obj)->ptr[i], arg, limit, weak);
w_object(RSTRUCT(obj)->ptr[i], arg, limit);
}
}
break;
Expand All @@ -655,15 +649,11 @@ w_object(obj, arg, limit, weak)
rb_obj_classname(obj));
}
v = rb_funcall(obj, s_dump_data, 0);
w_object(v, arg, limit, weak);
w_object(v, arg, limit);
}
break;

default:
if (weak) {
w_byte(TYPE_NIL, arg);
return;
}
rb_raise(rb_eTypeError, "can't dump %s",
rb_obj_classname(obj));
break;
Expand All @@ -678,7 +668,7 @@ static VALUE
dump(arg)
struct dump_call_arg *arg;
{
w_object(arg->obj, arg->arg, arg->limit, arg->weak);
w_object(arg->obj, arg->arg, arg->limit);
if (arg->arg->dest) {
rb_io_write(arg->arg->dest, arg->arg->str);
rb_str_resize(arg->arg->str, 0);
Expand Down Expand Up @@ -1216,10 +1206,6 @@ r_object0(arg, proc, ivp)
}
r_entry(v, arg);
data = r_object(arg);
if (ivp) {
r_ivar(v, arg);
*ivp = Qfalse;
}
rb_funcall(v, s_mload, 1, data);
}
break;
Expand Down
13 changes: 10 additions & 3 deletions pack.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -825,7 +825,7 @@ pack_pack(ary, fmt)

case 'U':
while (len-- > 0) {
unsigned long l;
long l;
char buf[8];
int le;

Expand All @@ -834,6 +834,9 @@ pack_pack(ary, fmt)
else {
l = NUM2ULONG(from);
}
if (l < 0) {
rb_raise(rb_eArgError, "pack(U): negative value");
}
le = uv_to_utf8(buf, l);
rb_str_buf_cat(res, (char*)buf, le);
}
Expand Down Expand Up @@ -918,7 +921,11 @@ pack_pack(ary, fmt)

if (NIL_P(from)) ul = 0;
else {
ul = NUM2ULONG(from);
long l = NUM2LONG(from);
if (l < 0) {
rb_raise(rb_eArgError, "cannot compress negative numbers");
}
ul = l;
}

while (ul) {
Expand Down Expand Up @@ -1857,7 +1864,7 @@ uv_to_utf8(buf, uv)
buf[5] = (uv&0x3f)|0x80;
return 6;
}
rb_raise(rb_eArgError, "uv_to_utf8(); value out of range");
rb_raise(rb_eArgError, "pack(U): value out of range");
}

static const long utf8_limits[] = {
Expand Down
21 changes: 10 additions & 11 deletions time.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1317,7 +1317,6 @@ time_mdump(time)
char buf[8];
time_t t;
int i;
VALUE str;

GetTimeval(time, tobj);

Expand Down Expand Up @@ -1345,13 +1344,7 @@ time_mdump(time)
s = RSHIFT(s, 8);
}

str = rb_str_new(buf, 8);
if (FL_TEST(time, FL_EXIVAR)) {
rb_copy_generic_ivar(str, time);
FL_SET(str, FL_EXIVAR);
}

return str;
return rb_str_new(buf, 8);
}

static VALUE
Expand All @@ -1360,10 +1353,16 @@ time_dump(argc, argv, time)
VALUE *argv;
VALUE time;
{
VALUE dummy;
VALUE str;

rb_scan_args(argc, argv, "01", &dummy);
return time_mdump(time);
rb_scan_args(argc, argv, "01", 0);
str = time_mdump(time);
if (FL_TEST(time, FL_EXIVAR)) {
rb_copy_generic_ivar(str, time);
FL_SET(str, FL_EXIVAR);
}

return str;
}

static VALUE
Expand Down
1 change: 1 addition & 0 deletions variable.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -780,6 +780,7 @@ rb_generic_ivar_table(obj)
{
st_table *tbl;

if (!FL_TEST(obj, FL_EXIVAR)) return 0;
if (!generic_iv_tbl) return 0;
if (!st_lookup(generic_iv_tbl, obj, (st_data_t *)&tbl)) return 0;
return tbl;
Expand Down

0 comments on commit 90a88ab

Please sign in to comment.