From de51a663b4300777be15003388070748a974e7c7 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 26 Mar 2001 08:57:16 +0000
Subject: * eval.c: remove TMP_PROTECT_END to prevent C_ALLOCA crash.

* file.c (rb_file_flock): do not trap EINTR.

* missing/flock.c (flock): returns the value from lockf(2)
  directly.

* eval.c (ev_const_defined): should ignore toplevel cbase (Object).

* eval.c (ev_const_get): ditto.

* ext/md5/md5.h: replace by independent md5 implementation
  contributed by L. Peter Deutsch (thanks).

* ext/md5/md5init.c: adopted to Deutsch's md5 implementation.

* pack.c (pack_unpack): string from P/p should be tainted.

* ext/curses/curses.c: curses on Mac OS X public beta does not
  have _maxx etc.

* marshal.c (w_object): should truncate trailing zero short for
  bignums.

* object.c (sym_intern): new method.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1281 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 marshal.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'marshal.c')

diff --git a/marshal.c b/marshal.c
index ec6cc35fd1..a1ff9e2b0e 100644
--- a/marshal.c
+++ b/marshal.c
@@ -376,10 +376,10 @@ w_object(obj, arg, limit)
 		    BDIGIT num = *d;
 		    int i;
 
-		    for (i=0; i<SIZEOF_BDIGITS; i+=sizeof(short)) {
+		    for (i=0; i<SIZEOF_BDIGITS; i+=SIZEOF_SHORT) {
 			w_short(num & SHORTMASK, arg);
 			num = SHORTDN(num);
-			if (num == 0) break;
+			if (len == 0 && num == 0) break;
 		    }
 #else
 		    w_short(*d, arg);
-- 
cgit v1.2.3