Commit 64dc3289 authored by unknown's avatar unknown
Browse files

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
parent 5f8bd7fe

sql/item_xmlfunc.cc

+2 −7
Original line number Diff line number Diff line
@@ -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);

}