diff options
| author | Sergey Glukhov <sergey.glukhov@oracle.com> | 2010-11-18 12:14:27 +0300 |
|---|---|---|
| committer | Sergey Glukhov <sergey.glukhov@oracle.com> | 2010-11-18 12:14:27 +0300 |
| commit | 52e88852697896b7fd150faf28c60a56cda42ab8 (patch) | |
| tree | 3e9798ec74b0e0d8d821075dc8feaed107d7d864 /sql | |
| parent | 2db0a406fd726e5bbbfef1ea9c01df12c24441fc (diff) | |
| parent | 1c94d43bbb60817252a87453d3a1d1a7d0f2a35c (diff) | |
| download | mariadb-git-52e88852697896b7fd150faf28c60a56cda42ab8.tar.gz | |
5.1-security->5.5-security merge
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_cmpfunc.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index b04ec105468..f89eabaa868 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -4720,6 +4720,7 @@ bool Item_func_like::fix_fields(THD *thd, Item **ref) String *escape_str= escape_item->val_str(&cmp.value1); if (escape_str) { + const char *escape_str_ptr= escape_str->ptr(); if (escape_used_in_parsing && ( (((thd->variables.sql_mode & MODE_NO_BACKSLASH_ESCAPES) && escape_str->numchars() != 1) || @@ -4734,9 +4735,9 @@ bool Item_func_like::fix_fields(THD *thd, Item **ref) CHARSET_INFO *cs= escape_str->charset(); my_wc_t wc; int rc= cs->cset->mb_wc(cs, &wc, - (const uchar*) escape_str->ptr(), - (const uchar*) escape_str->ptr() + - escape_str->length()); + (const uchar*) escape_str_ptr, + (const uchar*) escape_str_ptr + + escape_str->length()); escape= (int) (rc > 0 ? wc : '\\'); } else @@ -4753,13 +4754,13 @@ bool Item_func_like::fix_fields(THD *thd, Item **ref) { char ch; uint errors; - uint32 cnvlen= copy_and_convert(&ch, 1, cs, escape_str->ptr(), + uint32 cnvlen= copy_and_convert(&ch, 1, cs, escape_str_ptr, escape_str->length(), escape_str->charset(), &errors); escape= cnvlen ? ch : '\\'; } else - escape= *(escape_str->ptr()); + escape= escape_str_ptr ? *escape_str_ptr : '\\'; } } else |