summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2016-03-24 08:57:41 +0100
committerOleksandr Byelkin <sanja@mariadb.com>2016-03-24 08:57:41 +0100
commitf6d99a0d8a805873ca1846db4773afa4b0c5e1b7 (patch)
treeff88512ef090bc91a820751e135ae3decebe6221 /mysys
parent22ebf3cb456e0d8db295e7cc93f08e3d3ecfea47 (diff)
downloadmariadb-git-f6d99a0d8a805873ca1846db4773afa4b0c5e1b7.tar.gz
MDEV-9773: Memory corruption in mariadb_dyncol_unpack
Fixed calculating pointer to memory allocated for names in numeric format in unpacking procedure.
Diffstat (limited to 'mysys')
-rw-r--r--mysys/ma_dyncol.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/ma_dyncol.c b/mysys/ma_dyncol.c
index d7d4a127a75..7cd0c2b02df 100644
--- a/mysys/ma_dyncol.c
+++ b/mysys/ma_dyncol.c
@@ -4249,7 +4249,7 @@ mariadb_dyncol_unpack(DYNAMIC_COLUMN *str,
{
*names= my_malloc(sizeof(LEX_STRING) * header.column_count +
DYNCOL_NUM_CHAR * header.column_count, MYF(0));
- nm= (char *)(names + sizeof(LEX_STRING) * header.column_count);
+ nm= (char *)((*names) + header.column_count);
}
else
{