mirror of
https://github.com/python/cpython.git
synced 2024-11-28 08:20:55 +01:00
fc9da96274
Allow controlling Expat >=2.6.0 reparse deferral (CVE-2023-52425) by adding five new methods: - `xml.etree.ElementTree.XMLParser.flush` - `xml.etree.ElementTree.XMLPullParser.flush` - `xml.parsers.expat.xmlparser.GetReparseDeferralEnabled` - `xml.parsers.expat.xmlparser.SetReparseDeferralEnabled` - `xml.sax.expatreader.ExpatParser.flush` Based on the "flush" idea from #115138 (comment) . - Please treat as a security fix related to CVE-2023-52425. (cherry picked from commit6a95676) (cherry picked from commit73807eb) (cherry picked from commiteda2963) --------- Includes code suggested-by: Snild Dolkow <snild@sony.com> and by core dev Serhiy Storchaka. Co-authored-by: Gregory P. Smith <greg@krypto.org>
58 lines
2.5 KiB
C
58 lines
2.5 KiB
C
/* Stuff to export relevant 'expat' entry points from pyexpat to other
|
|
* parser modules, such as cElementTree. */
|
|
|
|
/* note: you must import expat.h before importing this module! */
|
|
|
|
#define PyExpat_CAPI_MAGIC "pyexpat.expat_CAPI 1.1"
|
|
#define PyExpat_CAPSULE_NAME "pyexpat.expat_CAPI"
|
|
|
|
struct PyExpat_CAPI
|
|
{
|
|
char* magic; /* set to PyExpat_CAPI_MAGIC */
|
|
int size; /* set to sizeof(struct PyExpat_CAPI) */
|
|
int MAJOR_VERSION;
|
|
int MINOR_VERSION;
|
|
int MICRO_VERSION;
|
|
/* pointers to selected expat functions. add new functions at
|
|
the end, if needed */
|
|
const XML_LChar * (*ErrorString)(enum XML_Error code);
|
|
enum XML_Error (*GetErrorCode)(XML_Parser parser);
|
|
XML_Size (*GetErrorColumnNumber)(XML_Parser parser);
|
|
XML_Size (*GetErrorLineNumber)(XML_Parser parser);
|
|
enum XML_Status (*Parse)(
|
|
XML_Parser parser, const char *s, int len, int isFinal);
|
|
XML_Parser (*ParserCreate_MM)(
|
|
const XML_Char *encoding, const XML_Memory_Handling_Suite *memsuite,
|
|
const XML_Char *namespaceSeparator);
|
|
void (*ParserFree)(XML_Parser parser);
|
|
void (*SetCharacterDataHandler)(
|
|
XML_Parser parser, XML_CharacterDataHandler handler);
|
|
void (*SetCommentHandler)(
|
|
XML_Parser parser, XML_CommentHandler handler);
|
|
void (*SetDefaultHandlerExpand)(
|
|
XML_Parser parser, XML_DefaultHandler handler);
|
|
void (*SetElementHandler)(
|
|
XML_Parser parser, XML_StartElementHandler start,
|
|
XML_EndElementHandler end);
|
|
void (*SetNamespaceDeclHandler)(
|
|
XML_Parser parser, XML_StartNamespaceDeclHandler start,
|
|
XML_EndNamespaceDeclHandler end);
|
|
void (*SetProcessingInstructionHandler)(
|
|
XML_Parser parser, XML_ProcessingInstructionHandler handler);
|
|
void (*SetUnknownEncodingHandler)(
|
|
XML_Parser parser, XML_UnknownEncodingHandler handler,
|
|
void *encodingHandlerData);
|
|
void (*SetUserData)(XML_Parser parser, void *userData);
|
|
void (*SetStartDoctypeDeclHandler)(XML_Parser parser,
|
|
XML_StartDoctypeDeclHandler start);
|
|
enum XML_Status (*SetEncoding)(XML_Parser parser, const XML_Char *encoding);
|
|
int (*DefaultUnknownEncodingHandler)(
|
|
void *encodingHandlerData, const XML_Char *name, XML_Encoding *info);
|
|
/* might be NULL for expat < 2.1.0 */
|
|
int (*SetHashSalt)(XML_Parser parser, unsigned long hash_salt);
|
|
/* might be NULL for expat < 2.6.0 */
|
|
XML_Bool (*SetReparseDeferralEnabled)(XML_Parser parser, XML_Bool enabled);
|
|
/* always add new stuff to the end! */
|
|
};
|
|
|