summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Malyavin <nikitamalyavin@gmail.com>2020-01-13 17:53:40 +1000
committerNikita Malyavin <nikitamalyavin@gmail.com>2020-02-21 13:49:32 +1000
commit7bd01e8d8e4690b076916a3a34d88b51c1eecad0 (patch)
tree924cd03c8a3329b8a555c3fda4afcee647ea49c1
parent56ba5be1446dbe900c5516019122f932615c01b0 (diff)
downloadmariadb-git-7bd01e8d8e4690b076916a3a34d88b51c1eecad0.tar.gz
add frm corruption check for extra2.application_period
-rw-r--r--sql/table.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/table.cc b/sql/table.cc
index 995d2bf6cb9..c8b43e87a7e 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -2251,6 +2251,11 @@ int TABLE_SHARE::init_from_binary_frm_image(THD *thd, bool write,
if (init_period_from_extra2(&period, pos, end))
goto err;
+ if (extra2_str_size(period.name.length)
+ + extra2_str_size(period.constr_name.length)
+ + 2 * frm_fieldno_size
+ != extra2.application_period.length)
+ goto err;
status_var_increment(thd->status_var.feature_application_time_periods);
}