diff options
| author | unknown <bar@mysql.com> | 2006-03-22 12:57:41 +0400 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2006-03-22 12:57:41 +0400 |
| commit | 64dc3289de27a26872f77070b693f52c88a9c36b (patch) | |
| tree | 95e2b7e3925545c7d7eae5172b5dd787c0ac55dc /sql/item_xmlfunc.cc | |
| parent | 5f8bd7fe0f4ecc534b24f1e13276b7200ec14bd2 (diff) | |
| download | mariadb-git-64dc3289de27a26872f77070b693f52c88a9c36b.tar.gz | |
item_xmlfunc.cc:
After review fix.
Thanks to Gluh for suggestion.
Bug#18172: XML: Extractvalue() accepts mallformed XPath without a XPath syntax error
sql/item_xmlfunc.cc:
After review fix.
Thanks to Gluh for suggestion.
Bug#18172: XML: Extractvalue() accepts mallformed XPath without a XPath syntax error
Diffstat (limited to 'sql/item_xmlfunc.cc')
| -rw-r--r-- | sql/item_xmlfunc.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sql/item_xmlfunc.cc b/sql/item_xmlfunc.cc index 8e5efa9f0f5..ae626b7c368 100644 --- a/sql/item_xmlfunc.cc +++ b/sql/item_xmlfunc.cc @@ -1561,13 +1561,8 @@ static int my_xpath_parse_AbsoluteLocationPath(MY_XPATH *xpath) return my_xpath_parse_RelativeLocationPath(xpath); } - if (my_xpath_parse_term(xpath, MY_XPATH_LEX_EOF)) - return 1; - - if (my_xpath_parse_RelativeLocationPath(xpath)) - return 1; - - return 0; + return my_xpath_parse_term(xpath, MY_XPATH_LEX_EOF) || + my_xpath_parse_RelativeLocationPath(xpath); } |