summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNayuta Yanagisawa <nayuta.yanagisawa@hey.com>2022-08-10 10:40:37 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2022-08-10 11:20:58 +0200
commitfaddcf3c395da640b760c3f701f5bc1f3baae6c4 (patch)
treeee9dcb433cab353ec6a87db74cfeeac09b275f27
parent122742897b47a19c85b1a5e9932ab3a8c2a4134e (diff)
downloadmariadb-git-faddcf3c395da640b760c3f701f5bc1f3baae6c4.tar.gz
Do not check symbol returned (or not and so there is some garbadge) by mb_wc() if mb_wc() failedmariadb-10.3.36
-rw-r--r--sql/strfunc.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/strfunc.cc b/sql/strfunc.cc
index 99ff9c50588..a0a465bdf94 100644
--- a/sql/strfunc.cc
+++ b/sql/strfunc.cc
@@ -70,7 +70,7 @@ ulonglong find_set(TYPELIB *lib, const char *str, size_t length, CHARSET_INFO *c
if ((mblen= cs->cset->mb_wc(cs, &wc, (const uchar *) pos,
(const uchar *) end)) < 1)
mblen= 1; // Not to hang on a wrong multibyte sequence
- if (wc == (my_wc_t) field_separator)
+ else if (wc == (my_wc_t) field_separator)
break;
}
}