diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-01-19 12:22:12 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-01-19 12:22:12 +0100 |
| commit | f31bf6f09426155bb4efa9d2ea6060fb71da87a2 (patch) | |
| tree | 4987b6ded980cb6524d5d4e0ce8dfdc9f9b67ae6 /sql-common | |
| parent | 02af6278fb7c7889a02d617eb23e82fe7967abd7 (diff) | |
| parent | 4d1c1b23e1373bbd4e72f524e855f1db076d2c73 (diff) | |
| download | mariadb-git-f31bf6f09426155bb4efa9d2ea6060fb71da87a2.tar.gz | |
Merge branch '5.5' into 10.1
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index fe73887106e..4f1cc6c564e 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -3588,7 +3588,10 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user, scramble_data_len= pkt_scramble_len; scramble_plugin= scramble_data + scramble_data_len; if (scramble_data + scramble_data_len > pkt_end) - scramble_data_len= pkt_end - scramble_data; + { + set_mysql_error(mysql, CR_MALFORMED_PACKET, unknown_sqlstate); + goto error; + } } else { |