summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2017-05-23 11:09:47 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2017-05-23 11:09:47 +0300
commit8f643e2063c9890a353149f39ef85b2cf3151fd0 (patch)
treec5468b905c8858dc1cc80ccb2072a923b28c8783 /strings
parent3aecedb2f8f99c446a5ba0b02efcf422a252c9e8 (diff)
parentb61700c22104b513caa9a85e5c6529aa5f2bf4e4 (diff)
downloadmariadb-git-8f643e2063c9890a353149f39ef85b2cf3151fd0.tar.gz
Merge 10.1 into 10.2
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 12d511162d7..0aed6c8bf52 100644
--- a/strings/ctype.c
+++ b/strings/ctype.c
@@ -762,7 +762,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';