XPath fixes (now it should fail to compile incorrect queries)

git-svn-id: http://pugixml.googlecode.com/svn/trunk@123 99668b35-9821-0410-8761-19e4c4f06640

1 files changed, 13 insertions, 1 deletions

diff --git a/src/pugixpath.cpp b/src/pugixpath.cpp
index 8111b23..de166f4 100644
--- a/src/pugixpath.cpp
+++ b/src/pugixpath.cpp
@@ -1070,6 +1070,10 @@ namespace pugi
 

 					m_cur_lexeme = lex_string;

 				}

+				else

+				{

+					throw xpath_exception("Unrecognized token");

+				}

 			}

 		}

 

@@ -3496,7 +3500,15 @@ namespace pugi
 

 		xpath_ast_node* parse()

 		{

-			return parse_expression();

+			xpath_ast_node* result = parse_expression();

+			

+			if (m_lexer.current() != lex_none)

+			{

+				// there are still unparsed tokens left, error

+				throw xpath_exception("Incorrect query");

+			}

+			

+			return result;

 		}

 	};