diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-16 07:39:15 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-16 07:39:15 +0300 |
| commit | 9e6e43551fc61bc34152f8d60f5d72f0d3814787 (patch) | |
| tree | 67a834e1fee12ed5d4bf9897aa00146d728d936b /sql/log_event.cc | |
| parent | 4f29d776c756ac522ae49c481ea8975dee8787fe (diff) | |
| parent | 3d0bb2b7f1eb39d1b3773e634499ff98576679f7 (diff) | |
| download | mariadb-git-9e6e43551fc61bc34152f8d60f5d72f0d3814787.tar.gz | |
Merge 10.3 into 10.4
We will expose some more std::atomic internals in Atomic_counter,
so that dict_index_t::lock will support the default assignment operator.
Diffstat (limited to 'sql/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 1a77397bf79..3707f73a716 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -10775,6 +10775,8 @@ const char *sql_ex_info::init(const char *buf, const char *buf_end, } else { + if (buf_end - buf < 7) + return 0; // Wrong data field_term_len= enclosed_len= line_term_len= line_start_len= escaped_len=1; field_term = buf++; // Use first byte in string enclosed= buf++; |