Skip to content

[2.7] bpo-31170: Update libexpat from 2.2.3 to 2.2.4 (#3315) #3351

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

Jump to bottom
Closed
vstinner wants to merge 4 commits into from
Closed

[2.7] bpo-31170: Update libexpat from 2.2.3 to 2.2.4 (#3315) #3351

vstinner wants to merge 4 commits into from

Conversation

@vstinner
Copy link
Member

@vstinner vstinner commented Sep 5, 2017 •
edited by bedevere-bot
Loading

  • bpo-31170: Update libexpat from 2.2.3 to 2.2.4

Fix copying of partial characters for UTF-8 input (libexpat bug 115):
libexpat/libexpat#115

  • Add NEWS entry.

(cherry picked from commit 759e30e)

https://bugs.python.org/issue31170

@vstinner
bpo-31170: Update libexpat from 2.2.3 to 2.2.4 (#3315)
8be11cf 
* bpo-31170: Update libexpat from 2.2.3 to 2.2.4

Fix copying of partial characters for UTF-8 input (libexpat bug 115):
libexpat/libexpat#115

* Add NEWS entry.

(cherry picked from commit 759e30e)
@vstinner vstinner added the type-security A security issue label Sep 5, 2017
tiran
tiran previously requested changes Sep 5, 2017
View reviewed changes
Copy link
Member

@tiran tiran left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Breaks Windows builds:

..\Modules\expat\xmltok.c(34): fatal error C1083: Cannot open include file: 'stdbool.h': No such file or directory [C:\projects\cpython\PCbuild\pyexpat.vcxproj]

@bedevere-bot
Copy link

bedevere-bot commented Sep 5, 2017

A Python core developer has requested some changes be made to your pull request before we can consider merging it. If you could please address their requests along with any other requests in other reviews from core developers that would be appreciated.

Once you have made the requested changes, please leave a comment on this pull request containing the phrase I didn't expect the Spanish Inquisition!. I will then notify any core developers who have left a review that you're ready for them to take another look at this pull request.

@vstinner
expat: Fix compile error with Visual Studio 2012
a98c4a1 
The standard header stdbool.h is not available
with old Visual Studio compilers

Cherry-picked from libexpat b4b89c2ab0cc5325a41360c25ef9d2ccbe617e5c.
@vstinner
Copy link
Member Author

vstinner commented Sep 5, 2017

"Breaks Windows builds: ..\Modules\expat\xmltok.c(34): fatal error C1083: Cannot open include file: 'stdbool.h': No such file or directory [C:\projects\cpython\PCbuild\pyexpat.vcxproj]"

I spent 15 minutes to write a fix for libexpat. But i was working on the 2.2.4 branch, in fact the bug is already fixed upstream: libexpat/libexpat@b4b89c2

So I cherry-picked the fix.

@vstinner
expat: Add artificial scopes in xmltok.c utf8_toUtf8() to fix c89 com…
0bd6142 
…pilation.

Cherry-picked from libexpat commit e0b290eb3d8f4c4b45137a7d7f4f8db812145bd2
@vstinner vstinner dismissed tiran’s stale review September 6, 2017 00:12

Yeah, tests pass on Windows (AppVeyor) :-)

@benjaminp
Copy link
Contributor

benjaminp commented Sep 6, 2017

Thanks. Since this is going into 2.7.14 final, I'll deal with it.

@benjaminp
Copy link
Contributor

benjaminp commented Sep 6, 2017

c00d508

@benjaminp benjaminp closed this Sep 6, 2017
@vstinner vstinner deleted the expat224_27 branch September 6, 2017 01:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tiran tiran tiran left review comments

Assignees

No one assigned

Labels

type-security A security issue

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@vstinner @bedevere-bot @benjaminp @tiran @Mariatta @the-knights-who-say-ni