1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

A fix (bug #9756: mysql client failing on dumps containing certain \ sequences).

Browse Source 
mysys/charset.c:
  A fix (bug #9756: mysql client failing on dumps containing certain \ sequences).
  As 'to_end' points to the last position we should use '>' comparison 
  instead of '>=' there.
  'l' replaced with 'tmp_length' (in order not to mix 'l' with '1').
This commit is contained in:
unknown 2005-04-26 15:43:20 +05:00
parent 22311d2775
commit 38360ef375
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mysys/charset.c
View File

@ -581,15 +581,15 @@ ulong escape_string_for_mysql(CHARSET_INFO *charset_info,
{ {
char escape=0; char escape=0;
#ifdef USE_MB #ifdef USE_MB
int l; int tmp_length;
if (use_mb_flag && (l= my_ismbchar(charset_info, from, end))) if (use_mb_flag && (tmp_length= my_ismbchar(charset_info, from, end)))
{ {
if (to + l >= to_end) if (to + tmp_length > to_end)
{ {
overflow=1; overflow=1;
break; break;
} }
while (l--) while (tmp_length--)
*to++= *from++; *to++= *from++;
from--; from--;
continue; continue;
@ -605,7 +605,7 @@ ulong escape_string_for_mysql(CHARSET_INFO *charset_info,
multi-byte character into a valid one. For example, 0xbf27 is not multi-byte character into a valid one. For example, 0xbf27 is not
a valid GBK character, but 0xbf5c is. (0x27 = ', 0x5c = \) a valid GBK character, but 0xbf5c is. (0x27 = ', 0x5c = \)
*/ */
if (use_mb_flag && (l= my_mbcharlen(charset_info, *from)) > 1) if (use_mb_flag && (tmp_length= my_mbcharlen(charset_info, *from)) > 1)
escape= *from; escape= *from;
else else
#endif #endif
@ -634,7 +634,7 @@ ulong escape_string_for_mysql(CHARSET_INFO *charset_info,
} }
if (escape) if (escape)
{ {
if (to + 2 >= to_end) if (to + 2 > to_end)
{ {
overflow=1; overflow=1;
break; break;
@ -644,7 +644,7 @@ ulong escape_string_for_mysql(CHARSET_INFO *charset_info,
} }
else else
{ {
if (to + 1 >= to_end) if (to + 1 > to_end)
{ {
overflow=1; overflow=1;
break; break;