diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-05-04 16:05:30 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-05-05 01:05:05 +0200 |
| commit | bf9404d3a493ba122bc46c0fadf33d8cda9d0d3f (patch) | |
| tree | f2b9467bf68d626f84c1050a1e2d54280f331444 /sql/create_options.h | |
| parent | bba3d42a1f2566dd8ab11d5910444409c93b8194 (diff) | |
| download | mariadb-git-bf9404d3a493ba122bc46c0fadf33d8cda9d0d3f.tar.gz | |
protect against corrupted frms
when reading table options
Diffstat (limited to 'sql/create_options.h')
| -rw-r--r-- | sql/create_options.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/create_options.h b/sql/create_options.h index eb21f291ff4..f7b04f0484f 100644 --- a/sql/create_options.h +++ b/sql/create_options.h @@ -66,7 +66,8 @@ class engine_option_value: public Sql_alloc link(start, end); } } - static uchar *frm_read(const uchar *buff, engine_option_value **start, + static uchar *frm_read(const uchar *buff, const uchar *buff_end, + engine_option_value **start, engine_option_value **end, MEM_ROOT *root); void link(engine_option_value **start, engine_option_value **end); uint frm_length(); |