Cherry-pick fix for empty map check crash to 29.x #20904
Conversation
Fixes protocolbuffers#19624 Closes protocolbuffers#20446 COPYBARA_INTEGRATE_REVIEW=protocolbuffers#20446 from mjvankampen:fix/segfault-empty-map ea87203 PiperOrigin-RevId: 736519479
|
@anandolee Please let me know if you have any comments or if there is anything else I can do to help here. It would be great to have this bugfix backported to the 29.x and/or 30.x release branches, as it is needed to allow Pulumi to upgrade from Protobuf 4. Thank you! 🙏 |
|
We do not have plan for more 29.x release |
|
Thanks for the PR! Confirming that 29.x is indeed out of support with the release of 30.x and unlikely to get another patch release -- could you send us a cherry pick for 30.x instead? |
|
@anandolee @zhangskz Thank you! I will create a new PR with a 30.x backport shortly. As for 29.x, my understanding was that 29.x will be supported (albeit in "maintenance mode") until March 2026. Pulumi is currently stuck on Python Protobuf 4.x due to this bug; if the bug is only fixed in v30+, this would require Pulumi and its dependencies to jump from Python Protobuf 4.x to 6.x -- it would be preferable to allow for a more gradual upgrade to Python Protobuf 5 first. |
|
You are right Neil, 29.x is in maintenance mode. I would still suggest Pulumi to 6.x if possible. This PR can be merged to 29.x but we will not release 29.x very soon. Will consider a maintenance 29.x release around the time when we prepare v31 or v32 |
zhangskz
added
the
🅰️ safe for tests
github-actions
bot
removed
the
🅰️ safe for tests
### What changes were proposed in this pull request? Updating protobuf from 5.29.1 to 5.29.5 ### Why are the changes needed? - https://github.com/protocolbuffers/protobuf/releases/tag/v29.5 - protocolbuffers/protobuf#20904 - [Add recursion depth limits to pure python](protocolbuffers/protobuf@05ba1a8) - [Internal pure python fixes](protocolbuffers/protobuf@1ef3f01) ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? Passed all CI tests ### Was this patch authored or co-authored using generative AI tooling? No Closes #51747 from eschcam/py-protobuf-update. Authored-by: eschcam <[email protected]> Signed-off-by: Dongjoon Hyun <[email protected]>
4 participants
Cherry-pick #20446 to the 29.x branch. This is a fix for a crash on valid input, so I think it merits being cherry-picked to supported stable release branches.
Happy to send a similar PR for 30.x if that would be useful.