Skip to content
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

[3.8] bpo-46784: Add newly exported expat symbols to the namespace. (GH-31397) #31419

Merged
merged 1 commit into from Mar 8, 2022

Conversation

miss-islington
Copy link
Contributor

@miss-islington miss-islington commented Feb 18, 2022

The libexpat 2.4.1 upgrade from introduced the following new exported symbols:

  • testingAccountingGetCountBytesDirect
  • testingAccountingGetCountBytesIndirect
  • unsignedCharToPrintable
  • XML_SetBillionLaughsAttackProtectionActivationThreshold
  • XML_SetBillionLaughsAttackProtectionMaximumAmplification

We need to adjust Modules/expat/pyexpatns.h

(The newer libexpat upgrade has no new symbols).

Automerge-Triggered-By: GH:gpshead
(cherry picked from commit 6312c10)

Co-authored-by: Yilei "Dolee" Yang yileiyang@google.com

https://bugs.python.org/issue46784

@gpshead
Copy link
Member

@gpshead gpshead commented Feb 18, 2022

The expat upgrade was backported as a security fix within the past year, this goes along with that. Unclear how often people actually run into the underlying exported symbol conflict issue in practice.

@miss-islington
Copy link
Contributor Author

@miss-islington miss-islington commented Feb 18, 2022

@yilei: Status check is done, and it's a failure .

…GH-31397)

The libexpat 2.4.1 upgrade from  introduced the following new exported symbols:

* `testingAccountingGetCountBytesDirect`
* `testingAccountingGetCountBytesIndirect`
* `unsignedCharToPrintable`
* `XML_SetBillionLaughsAttackProtectionActivationThreshold`
* `XML_SetBillionLaughsAttackProtectionMaximumAmplification`

We need to adjust [Modules/expat/pyexpatns.h](https://github.com/python/cpython/blob/master/Modules/expat/pyexpatns.h)

(The newer libexpat upgrade  has no new symbols).

Automerge-Triggered-By: GH:gpshead
(cherry picked from commit 6312c10)

Co-authored-by: Yilei "Dolee" Yang <yileiyang@google.com>
@ambv ambv force-pushed the backport-6312c10-3.8 branch from d41f642 to 408cc84 Compare Mar 8, 2022
@ambv ambv merged commit ccbc31e into python:3.8 Mar 8, 2022
12 checks passed
@miss-islington miss-islington deleted the backport-6312c10-3.8 branch Mar 8, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CLA signed type-bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants