summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Malyavin <nikitamalyavin@gmail.com>2020-01-13 17:53:40 +1000
committerNikita Malyavin <nikitamalyavin@gmail.com>2020-01-27 16:53:14 +1000
commitd932d973cf4ecd0edb5a441dd3072861fc169419 (patch)
tree2036d703bc8dd41235af83bff66d59773cd796b9
parentc92d2c9efe3f751b6c45dfcc1db34b35fc52e74b (diff)
downloadmariadb-git-nm/without-overlaps-rebased.tar.gz
add frm corruption check for extra2.application_periodnm/without-overlaps-rebased
-rw-r--r--sql/table.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/table.cc b/sql/table.cc
index be5c489792d..0cd9204bdcc 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -2275,6 +2275,11 @@ int TABLE_SHARE::init_from_binary_frm_image(THD *thd, bool write,
if (init_period_from_extra2(&period, pos, end))
DBUG_RETURN(err());
+ if (extra2_str_size(period.name.length)
+ + extra2_str_size(period.constr_name.length)
+ + 2 * frm_fieldno_size
+ != extra2.application_period.length)
+ DBUG_RETURN(err());
status_var_increment(thd->status_var.feature_application_time_periods);
}