mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 10:14:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix error in parsing string literals containing a backslash followed

Browse source 
by a multi-byte character with a second byte of 0x5c (\). (Bug #8903)
This commit is contained in:
jimw@mysql.com 2005-02-03 16:07:32 -08:00
parent c2f3764ddc
commit c949055035
3 changed files with 37 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mysql-test/r/ctype_sjis.result
View file

@ -91,3 +91,7 @@ sjis_bin 6109
sjis_bin 61
sjis_bin 6120
drop table t1;
SET NAMES sjis;
SELECT HEX('佐淘　\圭') FROM DUAL;
HEX('佐淘　＼圭')
8DB2939181408C5C

7
mysql-test/t/ctype_sjis.test
View file

@ -68,3 +68,10 @@ SET collation_connection='sjis_japanese_ci';
-- source include/ctype_filesort.inc
SET collation_connection='sjis_bin';
-- source include/ctype_filesort.inc
# Check parsing of string literals in SJIS with multibyte characters that
# have an embedded \ in them. (Bug #8303)
--character_set sjis
SET NAMES sjis;
SELECT HEX('佐淘　\圭') FROM DUAL;

32
sql/sql_lex.cc
View file

@ -295,7 +295,18 @@ static char *get_text(LEX *lex)
found_escape=1;
if (lex->ptr == lex->end_of_query)
return 0;
yySkip();
#ifdef USE_MB
int l;
if (use_mb(cs) &&
(l = my_ismbchar(cs,
(const char *)lex->ptr,
(const char *)lex->end_of_query))) {
lex->ptr += l;
continue;
}
else
#endif
yySkip();
}
else if (c == sep)
{
@ -323,6 +334,10 @@ static char *get_text(LEX *lex)
else
{
uchar *to;
/* Re-use found_escape for tracking state of escapes */
found_escape= 0;
for (to=start ; str != end ; str++)
{
#ifdef USE_MB
@ -336,7 +351,7 @@ static char *get_text(LEX *lex)
continue;
}
#endif
if (*str == '\\' && str+1 != end)
if (!found_escape && *str == '\\' && str+1 != end)
{
switch(*++str) {
case 'n':
@ -362,15 +377,20 @@ static char *get_text(LEX *lex)
*to++= '\\'; // remember prefix for wildcard
/* Fall through */
default:
*to++ = *str;
found_escape= 1;
str--;
break;
}
}
else if (*str == sep)
*to++= *str++; // Two ' or "
else if (!found_escape && *str == sep)
{
found_escape= 1;
}
else
{
*to++ = *str;
found_escape= 0;
}
}
*to=0;
lex->yytoklen=(uint) (to-start);