Python: fix heap-use-after-free in MapIterator after map.clear() (#27257)

## Bug

`Clear()` in `map_container.cc` (line 294-302) calls
`reflection->ClearField()` which destroys all underlying map nodes via
`ClearTable(reset=true)`, but does not increment `self->version`.

All other mutators (ScalarMapSetItem, MessageMapSetItem, MergeFrom, etc.)
increment `self->version` after mutation. `IterNext()` relies on version
mismatch to detect concurrent modification and raise `RuntimeError`.
Without the version bump, a live iterator proceeds to dereference the
freed `NodeBase*` via `SetMapIteratorValue` → `UntypedMapIterator::PlusPlus`.

**ASAN confirmed:** heap-use-after-free, READ size 8 at
`UntypedMapIterator::PlusPlus` (map.h:599), freed by `ClearTable`
(map.h:345), allocated by `ScalarMapSetItem` (map_container.cc:416).

## Fix

Add `self->version++` after `ClearField` in `Clear()`, matching every
other mutator in the same file.

## Reproducer

```python
msg = M()  # proto3 with map<string, int32> mp
for k in ("a","b","c","d"): msg.mp[k] = 1
it = iter(msg.mp)
next(it)
msg.mp.clear()   # frees nodes, version NOT bumped
next(it)         # heap-use-after-free
```

Closes #27257

COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/27257 from vhullto:fix/python-map-clear-uaf fb35225110
PiperOrigin-RevId: 939482747
This commit is contained in:
vhulto 2026-06-28 13:40:37 -07:00 committed by Copybara-Service
parent 69f97e01f7
commit 9e9dbae858
2 changed files with 14 additions and 0 deletions

View file

@ -3041,6 +3041,19 @@ class Proto3Test(unittest.TestCase):
self.assertEqual(keys, int32_foreign_keys)
self.assertEqual(keys, list(msg.map_int32_foreign_message.keys()))
def test_map_clear_during_iteration(self):
# Regression: clear() did not bump iterator version, causing UAF.
msg = map_unittest_pb2.TestMap()
msg.map_string_string['a'] = '1'
msg.map_string_string['b'] = '2'
msg.map_string_string['c'] = '3'
msg.map_string_string['d'] = '4'
it = iter(msg.map_string_string)
next(it)
msg.map_string_string.clear()
with self.assertRaises(RuntimeError):
next(it)
def testSubmessageMap(self):
msg = map_unittest_pb2.TestMap()

View file

@ -285,6 +285,7 @@ PyObject* Clear(PyObject* _self) {
const Reflection* reflection = message->GetReflection();
reflection->ClearField(message, self->parent_field_descriptor);
self->version++;
Py_RETURN_NONE;
}