Skip to content

Cherry-pick fix for empty map check crash to 29.x #20904

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

Conversation

neilconway
Copy link

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.

Fixes protocolbuffers#19624

Closes protocolbuffers#20446

COPYBARA_INTEGRATE_REVIEW=protocolbuffers#20446 from mjvankampen:fix/segfault-empty-map ea87203
PiperOrigin-RevId: 736519479
@neilconway neilconway requested a review from a team as a code owner March 28, 2025 21:13
@neilconway neilconway requested review from anandolee and removed request for a team March 28, 2025 21:13
@neilconway
Copy link
Author

@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! 🙏

@anandolee anandolee requested a review from zhangskz April 1, 2025 21:34
@anandolee
Copy link
Contributor

anandolee commented Apr 1, 2025

We do not have plan for more 29.x release
Sounds reasonable to cherry-pick to 30.x
+@zhangskz please correct me if I was wrong.

@zhangskz
Copy link
Member

zhangskz commented Apr 1, 2025

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?

@neilconway
Copy link
Author

@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.

@anandolee
Copy link
Contributor

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

@anandolee anandolee enabled auto-merge (squash) April 3, 2025 18:31
@zhangskz zhangskz added the 🅰️ safe for tests Mark a commit as safe to run presubmits over label Apr 18, 2025
@github-actions github-actions bot removed the 🅰️ safe for tests Mark a commit as safe to run presubmits over label Apr 18, 2025
@anandolee anandolee merged commit 21fdb7a into protocolbuffers:29.x Apr 18, 2025
175 of 177 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants