summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2017-05-23 08:59:03 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2017-05-23 08:59:03 +0300
commitb61700c22104b513caa9a85e5c6529aa5f2bf4e4 (patch)
tree23f776bd41e4388241ebb43eb8102ca6d36d1b4a /strings
parent70df2bef7acffed1e7da21ba7b9c644a32e36f3a (diff)
parent725e47bfb524f4b1d29076c8777056bedd5f00ea (diff)
downloadmariadb-git-b61700c22104b513caa9a85e5c6529aa5f2bf4e4.tar.gz
Merge 10.0 into 10.1
Diffstat (limited to 'strings')
-rw-r--r--strings/ctype.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/strings/ctype.c b/strings/ctype.c
index 620c7e13503..4af60d16d29 100644
--- a/strings/ctype.c
+++ b/strings/ctype.c
@@ -750,7 +750,7 @@ static int cs_value(MY_XML_PARSER *st,const char *attr, size_t len)
/* Rules: Context */
case _CS_CONTEXT:
- if (len < sizeof(i->context) + 1)
+ if (len < sizeof(i->context))
{
memcpy(i->context, attr, len);
i->context[len]= '\0';