Fix SF 588452: debug build crashes on marshal.dumps([128] * 1000).

Thomas Heller · Thomas Heller · commit 3e1c18ad0c60 · 2002-07-30T11:40:57.000Z
See there for a description.

Added test case.

Bugfix candidate for 2.2.x, not sure about previous versions:
probably low priority, because virtually no one runs debug builds.
diff --git a/Lib/test/test_marshal.py b/Lib/test/test_marshal.py
@@ -39,3 +39,6 @@ def to_little_endian_string(value, nbytes):
             base = 0
         else:
             base >>= 1
+
+# Simple-minded check for SF 588452: Debug build crashes
+marshal.dumps([128] * 1000)
diff --git a/Python/marshal.c b/Python/marshal.c
@@ -84,17 +84,17 @@ w_string(char *s, int n, WFILE *p)
 static void
 w_short(int x, WFILE *p)
 {
-	w_byte( x      & 0xff, p);
-	w_byte((x>> 8) & 0xff, p);
+	w_byte((char)( x      & 0xff), p);
+	w_byte((char)((x>> 8) & 0xff), p);
 }
 
 static void
 w_long(long x, WFILE *p)
 {
-	w_byte((int)( x      & 0xff), p);
-	w_byte((int)((x>> 8) & 0xff), p);
-	w_byte((int)((x>>16) & 0xff), p);
-	w_byte((int)((x>>24) & 0xff), p);
+ 	w_byte((char)( x      & 0xff), p);
+ 	w_byte((char)((x>> 8) & 0xff), p);
+ 	w_byte((char)((x>>16) & 0xff), p);
+ 	w_byte((char)((x>>24) & 0xff), p);
 }
 
 #if SIZEOF_LONG > 4

Original file line number	Diff line number	Diff line change
`@@ -84,17 +84,17 @@ w_string(char s, int n, WFILE p)`
`84`	`84`	`static void`
`85`	`85`	`w_short(int x, WFILE *p)`
`86`	`86`	`{`
`87`		`- w_byte( x & 0xff, p);`
`88`		`- w_byte((x>> 8) & 0xff, p);`
	`87`	`+ w_byte((char)( x & 0xff), p);`
	`88`	`+ w_byte((char)((x>> 8) & 0xff), p);`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`static void`
`92`	`92`	`w_long(long x, WFILE *p)`
`93`	`93`	`{`
`94`		`- w_byte((int)( x & 0xff), p);`
`95`		`- w_byte((int)((x>> 8) & 0xff), p);`
`96`		`- w_byte((int)((x>>16) & 0xff), p);`
`97`		`- w_byte((int)((x>>24) & 0xff), p);`
	`94`	`+ w_byte((char)( x & 0xff), p);`
	`95`	`+ w_byte((char)((x>> 8) & 0xff), p);`
	`96`	`+ w_byte((char)((x>>16) & 0xff), p);`
	`97`	`+ w_byte((char)((x>>24) & 0xff), p);`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`#if SIZEOF_LONG > 4`