diff options
| author | unknown <bar@bar.mysql.r18.ru> | 2003-01-27 16:46:03 +0400 |
|---|---|---|
| committer | unknown <bar@bar.mysql.r18.ru> | 2003-01-27 16:46:03 +0400 |
| commit | e7660c64d79d739bbec11a9bf44a766b63e56f56 (patch) | |
| tree | 4f223a0fd8e44278f0b2d04a4d3b47deb3fa5b35 /sql/sql_string.cc | |
| parent | ecb55f4307f5b7cb38cf05cd5a701dd6a0dfa0a4 (diff) | |
| download | mariadb-git-e7660c64d79d739bbec11a9bf44a766b63e56f56.tar.gz | |
wb_wc and wc_mb now checks length inside
Diffstat (limited to 'sql/sql_string.cc')
| -rw-r--r-- | sql/sql_string.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_string.cc b/sql/sql_string.cc index 0d604d043cc..654076c3f41 100644 --- a/sql/sql_string.cc +++ b/sql/sql_string.cc @@ -706,7 +706,7 @@ copy_and_convert(char *to, uint32 to_length, CHARSET_INFO *to_cs, char *to_start= to; uchar *to_end= (uchar*) to+to_length; - while ((uchar*) from < from_end) + while (1) { if ((cnvres=from_cs->mb_wc(from_cs, &wc, (uchar*) from, from_end)) > 0) from+= cnvres; |