Merge pull request RustPython#1418 from vazrupe/bytes-neg-int

windelbouwman · web-flow · commit a9570065bdfc · 2019-09-26T10:45:08.000+02:00
Fix panic when using negative int for bytes()
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/tests/snippets/basic_types.py b/tests/snippets/basic_types.py
@@ -1,3 +1,6 @@
+from testutils import assert_raises
+
+
 # Spec: https://docs.python.org/2/library/types.html
 print(None)
 # TypeType
@@ -36,6 +39,9 @@
 except TypeError:
     pass
 
+with assert_raises(ValueError):
+    bytes(-1)
+
 a = bytearray([1, 2, 3])
 # assert a[1] == 2
 
diff --git a/vm/src/obj/objbyteinner.rs b/vm/src/obj/objbyteinner.rs
@@ -117,7 +117,9 @@ impl ByteInnerNewOptions {
             let value = if let OptionalArg::Present(ival) = self.val_option {
                 match_class!(match ival.clone() {
                     i @ PyInt => {
-                        let size = objint::get_value(&i.into_object()).to_usize().unwrap();
+                        let size = objint::get_value(&i.into_object())
+                            .to_usize()
+                            .ok_or_else(|| vm.new_value_error("negative count".to_string()))?;
                         Ok(vec![0; size])
                     }
                     _l @ PyString => {
