stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8209615: ParseError in XMLEventReader on a valid input

Browse Source 
Reviewed-by: lancea
This commit is contained in:
Joe Wang 2018-08-22 14:28:47 -07:00
parent 2406a52bd6
commit 8ead3758cb
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java
View File

@ -1634,6 +1634,8 @@ public class XMLDocumentFragmentScannerImpl
} }
} else { } else {
//CData partially returned due to the size limit //CData partially returned due to the size limit
fInCData = true;
fCDataEnd = false;
break; break;
} }
//by this time we have also read surrogate contents if any... //by this time we have also read surrogate contents if any...
@ -2928,7 +2930,11 @@ public class XMLDocumentFragmentScannerImpl
fUsebuffer = true; fUsebuffer = true;
//CDATA section is read up to the chunk size limit //CDATA section is read up to the chunk size limit
scanCDATASection(fContentBuffer , true); scanCDATASection(fContentBuffer , true);
setScannerState(SCANNER_STATE_CONTENT); if (!fCDataEnd) {
setScannerState(SCANNER_STATE_CDATA);
} else {
setScannerState(SCANNER_STATE_CONTENT);
}
//1. if fIsCoalesce is set to true we set the variable fLastSectionWasCData to true //1. if fIsCoalesce is set to true we set the variable fLastSectionWasCData to true
//and just call fDispatche.next(). Since we have set the scanner state to //and just call fDispatche.next(). Since we have set the scanner state to
//SCANNER_STATE_CONTENT (super state) parser will automatically recover and //SCANNER_STATE_CONTENT (super state) parser will automatically recover and
@ -2941,9 +2947,6 @@ public class XMLDocumentFragmentScannerImpl
//there might be more data to coalesce. //there might be more data to coalesce.
continue; continue;
} else if(fReportCdataEvent) { } else if(fReportCdataEvent) {
if (!fCDataEnd) {
setScannerState(SCANNER_STATE_CDATA);
}
return XMLEvent.CDATA; return XMLEvent.CDATA;
} else { } else {
return XMLEvent.CHARACTERS; return XMLEvent.CHARACTERS;