mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* 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] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4729 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
582b7e1ca9
commit
0b2e94b2ab
4 changed files with 20 additions and 3 deletions
|
@ -1,3 +1,11 @@
|
|||
Thu Oct 9 15:45:27 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||
|
||||
* 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 <nobu@ruby-lang.org>
|
||||
|
||||
* eval.c (rb_set_end_proc, rb_exec_end_proc): restore safe level.
|
||||
|
|
|
@ -492,8 +492,9 @@ w_object(obj, arg, limit, weak)
|
|||
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, Qtrue);
|
||||
w_object(v, arg, limit, weak);
|
||||
c_arg.weak = Qtrue;
|
||||
ivtbl = rb_generic_ivar_table(v);
|
||||
if (ivtbl) w_ivar(ivtbl, &c_arg);
|
||||
return;
|
||||
}
|
||||
|
@ -507,6 +508,7 @@ w_object(obj, arg, limit, weak)
|
|||
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);
|
||||
return;
|
||||
}
|
||||
|
|
2
pack.c
2
pack.c
|
@ -1857,7 +1857,7 @@ uv_to_utf8(buf, uv)
|
|||
buf[5] = (uv&0x3f)|0x80;
|
||||
return 6;
|
||||
}
|
||||
rb_raise(rb_eArgError, "uv_to_utf8(); too big value");
|
||||
rb_raise(rb_eArgError, "uv_to_utf8(); value out of range");
|
||||
}
|
||||
|
||||
static const long utf8_limits[] = {
|
||||
|
|
9
time.c
9
time.c
|
@ -1317,6 +1317,7 @@ time_mdump(time)
|
|||
char buf[8];
|
||||
time_t t;
|
||||
int i;
|
||||
VALUE str;
|
||||
|
||||
GetTimeval(time, tobj);
|
||||
|
||||
|
@ -1344,7 +1345,13 @@ time_mdump(time)
|
|||
s = RSHIFT(s, 8);
|
||||
}
|
||||
|
||||
return rb_str_new(buf, 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;
|
||||
}
|
||||
|
||||
static VALUE
|
||||
|
|
Loading…
Reference in a new issue