diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-04-20 13:16:03 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-04-20 14:33:24 +0200 |
| commit | 587568b72a0f4bcb284b292f158dea6f65c03487 (patch) | |
| tree | e9caae1f20e997ce2bc528fc41d1adbe2c2d8bf0 /sql-common | |
| parent | bcb36ee21e2515d17dcf03b760487e64eb780f2b (diff) | |
| parent | 51c415d97d60cad732d05c9d5516f7fa3fde1df9 (diff) | |
| download | mariadb-git-587568b72a0f4bcb284b292f158dea6f65c03487.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 a509645b743..5574ac332aa 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -1575,7 +1575,7 @@ read_one_row(MYSQL *mysql,uint fields,MYSQL_ROW row, ulong *lengths) } else { - if (len > (ulong) (end_pos - pos)) + if (pos + len > end_pos) { set_mysql_error(mysql, CR_UNKNOWN_ERROR, unknown_sqlstate); return -1; |