diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-01-31 19:28:38 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-01-31 19:28:38 +0100 |
| commit | a3a4ea935541bbe4b44a51d7f808119702e35841 (patch) | |
| tree | e6dd2a1803ab53da8b34c68384d4e1c7bd8fc27e /sql/log_event.cc | |
| parent | 560799ebd8efe11f4c4ae1bb9ed4d39185e03800 (diff) | |
| download | mariadb-git-a3a4ea935541bbe4b44a51d7f808119702e35841.tar.gz | |
postmerge rollbacks and fixes
Diffstat (limited to 'sql/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index a4fc2dd5398..1b372778b88 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -7941,12 +7941,7 @@ User_var_log_event(const char* buf, uint event_len, val_len= uint4korr(buf + UV_VAL_IS_NULL + UV_VAL_TYPE_SIZE + UV_CHARSET_NUMBER_SIZE); - if (val + val_len > buf_end) - { - error= true; - goto err; - } - + /** We need to check if this is from an old server that did not pack information for flags. @@ -7959,11 +7954,6 @@ User_var_log_event(const char* buf, uint event_len, we keep the flags set to UNDEF_F. */ uint bytes_read= ((val + val_len) - buf_start); - if (bytes_read > event_len) - { - error= true; - goto err; - } if ((data_written - bytes_read) > 0) { flags= (uint) *(buf + UV_VAL_IS_NULL + UV_VAL_TYPE_SIZE + |