diff options
| author | ramil/ram@mysql.com/ramil.myoffice.izhnet.ru <> | 2007-10-08 16:52:15 +0500 |
|---|---|---|
| committer | ramil/ram@mysql.com/ramil.myoffice.izhnet.ru <> | 2007-10-08 16:52:15 +0500 |
| commit | 29dca6ef333adfc018512d6c8618b706acbdd8f4 (patch) | |
| tree | 39fe2e77698160ab0630df4de4c2210a933cfb5d /sql/item_xmlfunc.cc | |
| parent | 0ff1b80bf043133268f45d17b8fcca5d3f727e53 (diff) | |
| download | mariadb-git-29dca6ef333adfc018512d6c8618b706acbdd8f4.tar.gz | |
Fix for bug #31438: updatexml still crashes
Problem: check missed if the second updatexml() argument is valid.
Fix: check it.
Diffstat (limited to 'sql/item_xmlfunc.cc')
| -rw-r--r-- | sql/item_xmlfunc.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_xmlfunc.cc b/sql/item_xmlfunc.cc index 15be9c97b6e..1a6c15a4d2e 100644 --- a/sql/item_xmlfunc.cc +++ b/sql/item_xmlfunc.cc @@ -2580,7 +2580,8 @@ void Item_xml_str_func::fix_length_and_dec() return; } - xp= args[1]->val_str(&tmp); + if (!(xp= args[1]->val_str(&tmp))) + return; my_xpath_init(&xpath); xpath.cs= collation.collation; xpath.debug= 0; |