diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-04-29 00:38:10 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-04-29 00:38:10 +0200 |
| commit | c4499a03917aecfc2d86142c469d02618cbec54b (patch) | |
| tree | 9cd51b7c8d2274300165840204ae3eb19401942f /sql-common | |
| parent | d6dbe8e2071bf9fdc21b5530abce88ff01b40e25 (diff) | |
| parent | 5cfe52314e29386e1867fad1b44eace2b9d0be7e (diff) | |
| download | mariadb-git-c4499a03917aecfc2d86142c469d02618cbec54b.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 5574ac332aa..d583f54bcba 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -1503,7 +1503,7 @@ MYSQL_DATA *cli_read_rows(MYSQL *mysql,MYSQL_FIELD *mysql_fields, else { cur->data[field] = to; - if (len > (ulong) (end_to - to)) + if (to + len > end_to) { free_rows(result); set_mysql_error(mysql, CR_MALFORMED_PACKET, unknown_sqlstate); |