diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-01-28 14:17:09 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-01-28 14:17:09 +0200 |
| commit | a983b2440767db660bdf38c4f8bb3a0b0f7b1d65 (patch) | |
| tree | 04beefc3687b10e2e2322e7c586aede2c4e272a2 /sql-common | |
| parent | a915142f48a42237021be590de37ffab4cc5b107 (diff) | |
| parent | bc891054962bc7cbd249f1ff75c64adb3b5bbc59 (diff) | |
| download | mariadb-git-a983b2440767db660bdf38c4f8bb3a0b0f7b1d65.tar.gz | |
Merge 10.4 into 10.5
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 4e63b3e9951..98173224f76 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -3032,7 +3032,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= (int)(pkt_end - scramble_data); + { + set_mysql_error(mysql, CR_MALFORMED_PACKET, unknown_sqlstate); + goto error; + } } else { |