Skip to content

[3.14] gh-149018: Use XML_SetHashSalt16Bytes in pyexpat/_elementtree when possible (GH-149023) #149646

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.

Sign up for GitHub

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
StanFromIreland merged 2 commits into from
Jun 9, 2026
Merged

[3.14] gh-149018: Use XML_SetHashSalt16Bytes in pyexpat/_elementtree when possible (GH-149023) #149646

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad6d59f
[3.14] gh-149018: Use `XML_SetHashSalt16Bytes` in `pyexpat`/`_element…
StanFromIreland May 10, 2026
07575d8
Merge branch '3.14' into backport-24b8f12-3.14
StanFromIreland Jun 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge branch '3.14' into backport-24b8f12-3.14
  • Loading branch information
@StanFromIreland
StanFromIreland authored Jun 9, 2026
commit 07575d88ee6d2b042e87ed45d164e704cae42b47
7 changes: 6 additions & 1 deletion Include/pyexpat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,12 @@ struct PyExpat_CAPI
XML_Parser parser, unsigned long long activationThresholdBytes);
XML_Bool (*SetAllocTrackerMaximumAmplification)(
XML_Parser parser, float maxAmplificationFactor);
/* might be NULL for expat < 2.8.0 */
/* might be NULL for expat < 2.4.0 */
XML_Bool (*SetBillionLaughsAttackProtectionActivationThreshold)(
XML_Parser parser, unsigned long long activationThresholdBytes);
XML_Bool (*SetBillionLaughsAttackProtectionMaximumAmplification)(
XML_Parser parser, float maxAmplificationFactor);
/* might be NULL for expat < 2.8.0 */
XML_Bool (*SetHashSalt16Bytes)(
XML_Parser parser, const uint8_t entropy[16]);
/* always add new stuff to the end! */
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.