* 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: http://svn.ruby-lang.org/repos/ruby/trunk@4729 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 8 insertions, 1 deletions

diff --git a/time.c b/time.c
index b157f6ff1..8c75b709f 100644
--- a/time.c
+++ b/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