freebsd-ports/textproc/xerces-c3/files/patch-src-xercesc-util-regx-RegxParser.cpp
Pietro Cerutti 5a4dd8ebb6 - Add patches to address upstream the following upstream issues [1]
* https://issues.apache.org/jira/browse/XERCESC-1994
  * https://issues.apache.org/jira/browse/XERCESC-1995
- Bump PORTREVISION
- While at it, add a 'test' target to run the provided test suite

PR:		171537 [1]
Submitted by:	Michael Gmelin <freebsd@grem.de>
2012-09-12 09:47:56 +00:00

43 lines
2.1 KiB
C++

--- src/xercesc/util/regx/RegxParser.cpp.orig
+++ src/xercesc/util/regx/RegxParser.cpp
@@ -691,11 +691,11 @@ RangeToken* RegxParser::parseCharacterClass(const bool useNRange) {
|| (ch == chDash && getCharData() == chCloseSquare && firstLoop))) {
// if regex = [-] then invalid...
// '[', ']', '-' not allowed and should be escaped
- XMLCh chStr[] = { ch, chNull };
+ XMLCh chStr[] = { static_cast<XMLCh>(ch), chNull };
ThrowXMLwithMemMgr2(ParseException,XMLExcepts::Parser_CC6, chStr, chStr, getMemoryManager());
}
if (ch == chDash && getCharData() == chDash && getState() != REGX_T_BACKSOLIDUS && !wasDecoded) {
- XMLCh chStr[] = { ch, chNull };
+ XMLCh chStr[] = { static_cast<XMLCh>(ch), chNull };
ThrowXMLwithMemMgr2(ParseException,XMLExcepts::Parser_CC6, chStr, chStr, getMemoryManager());
}
@@ -720,7 +720,7 @@ RangeToken* RegxParser::parseCharacterClass(const bool useNRange) {
else {
XMLInt32 rangeEnd = getCharData();
- XMLCh rangeEndStr[] = { rangeEnd, chNull };
+ XMLCh rangeEndStr[] = { static_cast<XMLCh>(rangeEnd), chNull };
if (type == REGX_T_CHAR) {
@@ -737,7 +737,7 @@ RangeToken* RegxParser::parseCharacterClass(const bool useNRange) {
processNext();
if (ch > rangeEnd) {
- XMLCh chStr[] = { ch, chNull };
+ XMLCh chStr[] = { static_cast<XMLCh>(ch), chNull };
ThrowXMLwithMemMgr2(ParseException,XMLExcepts::Parser_Ope3, rangeEndStr, chStr, getMemoryManager());
}
@@ -845,7 +845,7 @@ XMLInt32 RegxParser::decodeEscaped() {
break;
default:
{
- XMLCh chString[] = {chBackSlash, ch, chNull};
+ XMLCh chString[] = {chBackSlash, static_cast<XMLCh>(ch), chNull};
ThrowXMLwithMemMgr1(ParseException,XMLExcepts::Parser_Process2, chString, getMemoryManager());
}
}