summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-05-03 02:28:04 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-05-03 02:28:04 (GMT)
commit501182a47b722a02edd83a344ba53d06cd9afbd1 (patch)
tree3788bfd3a2d8ae11f76c0836d4905238e65f1278 /Lib
parent51454a62e235f27c28a24620c3df002d4076b57c (diff)
downloadcpython-501182a47b722a02edd83a344ba53d06cd9afbd1.zip
cpython-501182a47b722a02edd83a344ba53d06cd9afbd1.tar.gz
cpython-501182a47b722a02edd83a344ba53d06cd9afbd1.tar.bz2
just sort the items tuple directly (closes #24094)
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_json/test_dump.py19
1 files changed, 19 insertions, 0 deletions
diff --git a/Lib/test/test_json/test_dump.py b/Lib/test/test_json/test_dump.py
index af19258..fd0d86b 100644
--- a/Lib/test/test_json/test_dump.py
+++ b/Lib/test/test_json/test_dump.py
@@ -28,6 +28,25 @@ class TestDump:
self.assertEqual(self.dumps(a, default=crasher),
'[null, null, null, null, null]')
+ # Issue 24094
+ def test_encode_evil_dict(self):
+ class D(dict):
+ def keys(self):
+ return L
+
+ class X:
+ def __hash__(self):
+ del L[0]
+ return 1337
+
+ def __lt__(self, o):
+ return 0
+
+ L = [X() for i in range(1122)]
+ d = D()
+ d[1337] = "true.dat"
+ self.assertEqual(self.dumps(d, sort_keys=True), '{"1337": "true.dat"}')
+
class TestPyDump(TestDump, PyTest): pass