summaryrefslogtreecommitdiffstatshomepage
path: root/tests/extmod/machine1.py
diff options
context:
space:
mode:
authorArrowana <pierre.duval@gadz.org>2020-10-31 13:34:58 +1100
committerDamien George <damien@micropython.org>2020-11-13 11:13:37 +1100
commit922f81dfd1b94e23f23f05aac0ecafac8645ce46 (patch)
tree939e2c83ba702b812d455ec8d9e315c8c2b0cefa /tests/extmod/machine1.py
parent8a917ad2529ea3df5f47e2be5b4edf362d2d03f6 (diff)
downloadmicropython-922f81dfd1b94e23f23f05aac0ecafac8645ce46.tar.gz
micropython-922f81dfd1b94e23f23f05aac0ecafac8645ce46.zip
extmod/machine_mem: Only allow integers in machine.memX subscript.
Prior to this change machine.mem32['foo'] (or using any other non-integer subscript) could result in a fault due to 'foo' being interpreted as an integer. And when writing code it's hard to tell if the fault is due to a bad subscript type, or an integer subscript that specifies an invalid memory address. The type of the object used in the subscript is now tested to be an integer by using mp_obj_get_int_truncated instead of mp_obj_int_get_truncated. The performance hit of this change is minimal, and machine.memX objects are more for convenience than performance (there are many other ways to read/write memory in a faster way), Fixes issue #6588.
Diffstat (limited to 'tests/extmod/machine1.py')
-rw-r--r--tests/extmod/machine1.py20
1 files changed, 20 insertions, 0 deletions
diff --git a/tests/extmod/machine1.py b/tests/extmod/machine1.py
index 6ff38cc051..0c7f8122f4 100644
--- a/tests/extmod/machine1.py
+++ b/tests/extmod/machine1.py
@@ -26,3 +26,23 @@ try:
del machine.mem8[0]
except TypeError:
print("TypeError")
+
+try:
+ machine.mem8[0:1]
+except TypeError:
+ print("TypeError")
+
+try:
+ machine.mem8[0:1] = 10
+except TypeError:
+ print("TypeError")
+
+try:
+ machine.mem8["hello"]
+except TypeError:
+ print("TypeError")
+
+try:
+ machine.mem8["hello"] = 10
+except TypeError:
+ print("TypeError")