diff options
| author | Benjamin Peterson <benjamin@python.org> | 2019-09-26 04:33:58 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-26 04:33:58 (GMT) |
| commit | 52b940803860e37bcc3f6096b2d24e7c20a0e807 (patch) | |
| tree | 558aeb32f5f3be76cda9a24f970cc82ad4ee754e /Modules/expat/xmlrole.h | |
| parent | 49d99f01e6e51acec5ca57a02e857f0796bc418b (diff) | |
| download | cpython-52b940803860e37bcc3f6096b2d24e7c20a0e807.zip cpython-52b940803860e37bcc3f6096b2d24e7c20a0e807.tar.gz cpython-52b940803860e37bcc3f6096b2d24e7c20a0e807.tar.bz2 | |
closes bpo-38174: Update vendored expat library to 2.2.8. (GH-16346)
Fixes CVE-2019-15903. See full changelog at https://github.com/libexpat/libexpat/blob/R_2_2_8/expat/Changes.
Diffstat (limited to 'Modules/expat/xmlrole.h')
| -rw-r--r-- | Modules/expat/xmlrole.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/Modules/expat/xmlrole.h b/Modules/expat/xmlrole.h index e5f048e..036aba6 100644 --- a/Modules/expat/xmlrole.h +++ b/Modules/expat/xmlrole.h @@ -36,7 +36,7 @@ #ifdef __VMS /* 0 1 2 3 0 1 2 3 1234567890123456789012345678901 1234567890123456789012345678901 */ -#define XmlPrologStateInitExternalEntity XmlPrologStateInitExternalEnt +# define XmlPrologStateInitExternalEntity XmlPrologStateInitExternalEnt #endif #include "xmltok.h" @@ -113,11 +113,8 @@ enum { }; typedef struct prolog_state { - int (PTRCALL *handler) (struct prolog_state *state, - int tok, - const char *ptr, - const char *end, - const ENCODING *enc); + int(PTRCALL *handler)(struct prolog_state *state, int tok, const char *ptr, + const char *end, const ENCODING *enc); unsigned level; int role_none; #ifdef XML_DTD @@ -132,8 +129,8 @@ void XmlPrologStateInit(PROLOG_STATE *); void XmlPrologStateInitExternalEntity(PROLOG_STATE *); #endif /* XML_DTD */ -#define XmlTokenRole(state, tok, ptr, end, enc) \ - (((state)->handler)(state, tok, ptr, end, enc)) +#define XmlTokenRole(state, tok, ptr, end, enc) \ + (((state)->handler)(state, tok, ptr, end, enc)) #ifdef __cplusplus } |