mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
When escaping a string in a multi-byte character set, escape all bytes of
a character that appears to be a multi-byte character based on its first byte, but is not actually a valid multi-byte character. (Bug #8378)
This commit is contained in:
@ -11532,6 +11532,54 @@ static void test_bug6761(void)
|
||||
myquery(rc);
|
||||
}
|
||||
|
||||
/*
|
||||
Test mysql_real_escape_string() with gbk charset
|
||||
|
||||
The important part is that 0x27 (') is the second-byte in a invvalid
|
||||
two-byte GBK character here. But 0xbf5c is a valid GBK character, so
|
||||
it needs to be escaped as 0x5cbf5c27
|
||||
*/
|
||||
#define TEST_BUG8317_IN "\xef\xbb\xbf\x27"
|
||||
#define TEST_BUG8317_OUT "\xef\xbb\x5c\xbf\x5c\x27"
|
||||
|
||||
static void test_bug8317()
|
||||
{
|
||||
MYSQL *lmysql;
|
||||
char out[9]; /* strlen(TEST_BUG8317)*2+1 */
|
||||
int len;
|
||||
|
||||
myheader("test_bug8317");
|
||||
|
||||
if (!opt_silent)
|
||||
fprintf(stdout, "\n Establishing a test connection ...");
|
||||
if (!(lmysql= mysql_init(NULL)))
|
||||
{
|
||||
myerror("mysql_init() failed");
|
||||
exit(1);
|
||||
}
|
||||
if (mysql_options(lmysql, MYSQL_SET_CHARSET_NAME, "gbk"))
|
||||
{
|
||||
myerror("mysql_options() failed");
|
||||
exit(1);
|
||||
}
|
||||
if (!(mysql_real_connect(lmysql, opt_host, opt_user,
|
||||
opt_password, current_db, opt_port,
|
||||
opt_unix_socket, 0)))
|
||||
{
|
||||
myerror("connection failed");
|
||||
exit(1);
|
||||
}
|
||||
if (!opt_silent)
|
||||
fprintf(stdout, " OK");
|
||||
|
||||
len= mysql_real_escape_string(lmysql, out, TEST_BUG8317_IN, 4);
|
||||
|
||||
/* No escaping should have actually happened. */
|
||||
DIE_UNLESS(memcmp(out, TEST_BUG8317_OUT, len) == 0);
|
||||
|
||||
mysql_close(lmysql);
|
||||
}
|
||||
|
||||
/*
|
||||
Read and parse arguments and MySQL options from my.cnf
|
||||
*/
|
||||
@ -11739,6 +11787,7 @@ static struct my_tests_st my_tests[]= {
|
||||
{ "test_conversion", test_conversion },
|
||||
{ "test_rewind", test_rewind },
|
||||
{ "test_bug6761", test_bug6761 },
|
||||
{ "test_bug8317", test_bug8317 },
|
||||
{ 0, 0 }
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user