Add int multiplication overflow check & fix make's std output

asottile-archive · Sep 18, 2021 · 0af279d · 0af279d
1 parent ad7243a
commit 0af279d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/make.py b/make.py
@@ -13,7 +13,7 @@ def output_on_failure(cmd, cwd):
     )
     if ret.returncode:
         raise AssertionError('Command {!r} returned {}!\nOutput:\n{}'.format(
-            cmd, ret.returncode, ret.stdout,
+            cmd, ret.returncode, ret.stdout.decode(),
         ))
 
 

diff --git a/make0x.py b/make0x.py
@@ -13,7 +13,7 @@ def output_on_failure(cmd, cwd):
     )
     if ret.returncode:
         raise AssertionError('Command {!r} returned {}!\nOutput:\n{}'.format(
-            cmd, ret.returncode, ret.stdout,
+            cmd, ret.returncode, ret.stdout.decode(),
         ))
 
 

diff --git a/python-0.9.1/src/intobject.c b/python-0.9.1/src/intobject.c
@@ -188,14 +188,17 @@ int_mul(v, w)
        intobject *v;
        register object *w;
 {
-       register long a, b;
+       register long a, b, x;
        if (!is_intobject(w)) {
                err_badarg();
                return NULL;
        }
        a = v->ob_ival;
        b = ((intobject *)w) -> ob_ival;
-       return newintobject(a * b);
+       x = a * b;
+       if ( a != 0 && x / a != b)
+               return err_ovf();
+       return newintobject(x);
 }
 
 static object *