main/expat/expat-2.5.0.patch

263    if (parser->m_ns) {
264 -    XML_Char tmp[2] = {parser->m_namespaceSeparator, 0};
266 +    tmp[0] = parser->m_namespaceSeparator;
268      parser = parserCreate(encodingName, &parser->m_mem, tmp, newDtd);
270      parser = parserCreate(encodingName, &parser->m_mem, NULL, newDtd);
277      unsigned long version = parser->m_nsAttsVersion;
284 -    unsigned int nsAttsSize = 1u << parser->m_nsAttsPower;
285 -    unsigned char oldNsAttsPower = parser->m_nsAttsPower;
286 +    nsAttsSize = 1u << parser->m_nsAttsPower;
287 +    oldNsAttsPower = parser->m_nsAttsPower;
290          >> parser->m_nsAttsPower) { /* true for m_nsAttsPower = 0 */
292    if (parser->m_freeBindingList) {
293      b = parser->m_freeBindingList;
305            parser, b->uri, sizeof(XML_Char) * (len + EXPAND_SPARE));
318    DTD *const dtd = parser->m_dtd;
328    if (enc == parser->m_encoding) {
329      eventPP = &parser->m_eventPtr;
330      eventEndPP = &parser->m_eventEndPtr;
332        if (parser->m_prologState.level >= parser->m_groupSize) {
333          if (parser->m_groupSize) {
337              if (parser->m_groupSize > (unsigned int)(-1) / 2u) {
343                  parser, parser->m_groupConnector, parser->m_groupSize *= 2);
345                parser->m_groupSize /= 2;
352              if (parser->m_groupSize > (size_t)(-1) / sizeof(int)) {
359                  parser, dtd->scaffIndex, parser->m_groupSize * sizeof(int));
410    DTD *const dtd = parser->m_dtd; /* save one level of indirection */
428    ret = (XML_Content *)MALLOC(parser, allocsize);
666    XML_Parser parser = XML_ParserCreate(NULL);
667 -  assert(parser != NULL);
672 +  assert(parser != NULL);
681    XML_Parser parser = (XML_Parser)userData;
683    XML_StopParser(parser, XML_TRUE);
690 +      XML_Parser parser;
694 -      XML_Parser parser = XML_ParserCreate(NULL);
695 +      parser = XML_ParserCreate(NULL);
699            = XML_Parse(parser, doc, (int)strlen(doc), /*isFinal=*/XML_FALSE);
708    XML_Parser parser = XML_ParserCreate(NULL);
709    ParserPlusStorage parserPlusStorage = {parser, &storage};
714    XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);
715    XML_SetCommentHandler(parser, accumulate_and_suspend_comment_handler);
716    XML_SetUserData(parser, &parserPlusStorage);
718 -  enum XML_Status status = XML_Parse(parser, text, (int)strlen(text), XML_TRUE);
719 +  status = XML_Parse(parser, text, (int)strlen(text), XML_TRUE);
721      status = XML_ResumeParser(parser);
733    // &(parser->m_mem));" in function parserInit.
739        = XML_ExternalEntityParserCreate(parser, context, encodingName);
751        = (const struct AccountingTestCase *)XML_GetUserData(parser);
768 -  XML_Parser entParser = XML_ExternalEntityParserCreate(parser, context, 0);
769 +  entParser = XML_ExternalEntityParserCreate(parser, context, 0);
784        XML_Parser parser = XML_ParserCreate(NULL);
789        XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);
791          XML_SetExternalEntityRefHandler(parser,
802            = xmlParseFunction(parser, cases[u].primaryText,
805          _xml_failure(parser, __FILE__, __LINE__);
810            = testingAccountingGetCountBytesDirect(parser);
813            = testingAccountingGetCountBytesIndirect(parser);
815        XML_ParserFree(parser);