1 files changed, 2 insertions, 2 deletions
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);