bpo-45829: Check __getitem__'s version for overflow before specializing (GH-30129)

brandtbucher · web-flow · commit 62a8a0c5223f · 2021-12-16T11:08:20.000Z
* Check __getitem__'s version for overflow.

* Use SPEC_FAIL_OUT_OF_VERSIONS instead
diff --git a/Python/specialize.c b/Python/specialize.c
@@ -1187,7 +1187,7 @@ _Py_Specialize_BinarySubscr(
         assert(cls->tp_version_tag != 0);
         cache0->version = cls->tp_version_tag;
         int version = _PyFunction_GetVersionForCurrentState(func);
-        if (version == 0) {
+        if (version == 0 || version != (uint16_t)version) {
             SPECIALIZATION_FAIL(BINARY_SUBSCR, SPEC_FAIL_OUT_OF_VERSIONS);
             goto fail;
         }

Original file line number	Diff line number	Diff line change
`@@ -1187,7 +1187,7 @@ _Py_Specialize_BinarySubscr(`
`1187`	`1187`	`assert(cls->tp_version_tag != 0);`
`1188`	`1188`	`cache0->version = cls->tp_version_tag;`
`1189`	`1189`	`int version = _PyFunction_GetVersionForCurrentState(func);`
`1190`		`- if (version == 0) {`
	`1190`	`+ if (version == 0 \|\| version != (uint16_t)version) {`
`1191`	`1191`	`SPECIALIZATION_FAIL(BINARY_SUBSCR, SPEC_FAIL_OUT_OF_VERSIONS);`
`1192`	`1192`	`goto fail;`
`1193`	`1193`	`}`