Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#35: Possible hang in XML Parser #53

Closed
wants to merge 2 commits into from
Closed

#35: Possible hang in XML Parser #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f1b1b0
Solved infinite loop in MXParser when parsing a malformed Processing
belingueres Dec 4, 2018
ad00bc1
Merge branch 'master' into ISSUE-35
belingueres Mar 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion src/main/java/org/codehaus/plexus/util/xml/pull/MXParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3014,6 +3014,7 @@ protected boolean parsePI()

try
{
boolean seenPITarget = false;
boolean seenQ = false;
char ch = more();
if ( isS( ch ) )
Expand All @@ -3028,6 +3029,11 @@ protected boolean parsePI()

if ( ch == '?' )
{
if ( !seenPITarget )
{
throw new XmlPullParserException( "processing instruction PITarget name not found", this,
null );
}
seenQ = true;
}
else if ( ch == '>' )
Expand All @@ -3036,7 +3042,18 @@ else if ( ch == '>' )
{
break; // found end sequence!!!!
}
seenQ = false;

if ( !seenPITarget )
{
throw new XmlPullParserException( "processing instruction PITarget name not found", this,
null );
}
else
{
// seenPITarget && !seenQ
throw new XmlPullParserException( "processing instruction started on line " + curLine
+ " and column " + curColumn + " was not closed", this, null );
}
}
else
{
Expand Down Expand Up @@ -3075,6 +3092,7 @@ else if ( ch == '>' )
}
}
}

seenQ = false;
}
if ( normalizeIgnorableWS )
Expand Down Expand Up @@ -3124,6 +3142,7 @@ else if ( ch == '\n' )
normalizedCR = false;
}
}
seenPITarget = true;
ch = more();
}
}
Expand Down
134 changes: 134 additions & 0 deletions src/test/java/org/codehaus/plexus/util/xml/pull/MXParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
*/

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;

import java.io.IOException;
import java.io.StringReader;
Expand Down Expand Up @@ -235,4 +237,136 @@ public void testSubsequentProcessingInstructionMoreThan8k()
assertEquals( XmlPullParser.PROCESSING_INSTRUCTION, parser.nextToken() );
assertEquals( XmlPullParser.END_TAG, parser.nextToken() );
}

public void testMalformedProcessingInstructionAfterTag()
throws Exception
{
MXParser parser = new MXParser();

String input = "<project /><?>";

parser.setInput( new StringReader( input ) );

try
{
assertEquals( XmlPullParser.START_TAG, parser.next() );

assertEquals( XmlPullParser.END_TAG, parser.next() );

assertEquals( XmlPullParser.PROCESSING_INSTRUCTION, parser.next() );

fail( "Should fail since it has an invalid Processing Instruction" );
}
catch ( XmlPullParserException ex )
{
assertTrue( ex.getMessage().contains( "processing instruction PITarget name not found" ) );
}
}

public void testMalformedProcessingInstructionBeforeTag()
throws Exception
{
MXParser parser = new MXParser();

String input = "<?><project />";

parser.setInput( new StringReader( input ) );

try
{
assertEquals( XmlPullParser.PROCESSING_INSTRUCTION, parser.next() );

assertEquals( XmlPullParser.START_TAG, parser.next() );

assertEquals( XmlPullParser.END_TAG, parser.next() );

fail( "Should fail since it has invalid PI" );
}
catch ( XmlPullParserException ex )
{
assertTrue( ex.getMessage().contains( "processing instruction PITarget name not found" ) );
}
}

public void testMalformedProcessingInstructionSpaceBeforeName()
throws Exception
{
MXParser parser = new MXParser();

StringBuilder sb = new StringBuilder();
sb.append( "<? shouldhavenospace>" );
sb.append( "<project />" );

parser.setInput( new StringReader( sb.toString() ) );

try
{
assertEquals( XmlPullParser.PROCESSING_INSTRUCTION, parser.next() );

assertEquals( XmlPullParser.START_TAG, parser.next() );

assertEquals( XmlPullParser.END_TAG, parser.next() );

fail( "Should fail since it has invalid PI" );
}
catch ( XmlPullParserException ex )
{
assertTrue( ex.getMessage().contains( "processing instruction PITarget must be exactly after <? and not white space character" ) );
}
}

public void testMalformedProcessingInstructionNoClosingQuestionMark()
throws Exception
{
MXParser parser = new MXParser();

StringBuilder sb = new StringBuilder();
sb.append( "<?shouldhavenospace>" );
sb.append( "<project />" );

parser.setInput( new StringReader( sb.toString() ) );

try
{
assertEquals( XmlPullParser.PROCESSING_INSTRUCTION, parser.next() );

assertEquals( XmlPullParser.START_TAG, parser.next() );

assertEquals( XmlPullParser.END_TAG, parser.next() );

fail( "Should fail since it has invalid PI" );
}
catch ( XmlPullParserException ex )
{
assertTrue( ex.getMessage().contains( "processing instruction started on line 1 and column 2 was not closed" ) );
}
}

public void testSubsequentMalformedProcessingInstructionNoClosingQuestionMark()
throws Exception
{
MXParser parser = new MXParser();

StringBuilder sb = new StringBuilder();
sb.append( "<project />" );
sb.append( "<?shouldhavenospace>" );

parser.setInput( new StringReader( sb.toString() ) );

try
{
assertEquals( XmlPullParser.START_TAG, parser.next() );

assertEquals( XmlPullParser.END_TAG, parser.next() );

assertEquals( XmlPullParser.PROCESSING_INSTRUCTION, parser.next() );

fail( "Should fail since it has invalid PI" );
}
catch ( XmlPullParserException ex )
{
assertTrue( ex.getMessage().contains( "processing instruction started on line 1 and column 13 was not closed" ) );
}
}

}