summaryrefslogtreecommitdiff
path: root/strings/ctype-mb.c
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mnogosearch.org>2014-11-18 13:07:37 +0400
committerAlexander Barkov <bar@mnogosearch.org>2014-11-18 13:07:37 +0400
commit807934d08345c69ae31e0a0a1fcf7c92431d6204 (patch)
tree9bc2c3b0faf2a7202fd095eb5d3355ae0774b0ad /strings/ctype-mb.c
parent4d882329a998b7955cf164b5ff687e623d25bbb5 (diff)
downloadmariadb-git-807934d08345c69ae31e0a0a1fcf7c92431d6204.tar.gz
MDEV-7086 main.ctype_cp932 fails in buildbot on a valgrind build
Removing a redundant and wrong condition which could access beyond the pattern string range.
Diffstat (limited to 'strings/ctype-mb.c')
-rw-r--r--strings/ctype-mb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/strings/ctype-mb.c b/strings/ctype-mb.c
index b0413099ca8..02a9a91ca6a 100644
--- a/strings/ctype-mb.c
+++ b/strings/ctype-mb.c
@@ -354,7 +354,7 @@ int my_wildcmp_mb_impl(CHARSET_INFO *cs,
if (tmp <= 0)
return (tmp);
}
- } while (str != str_end && wildstr[0] != w_many);
+ } while (str != str_end);
return(-1);
}
}
@@ -1192,7 +1192,7 @@ static int my_wildcmp_mb_bin_impl(CHARSET_INFO *cs,
if (tmp <= 0)
return (tmp);
}
- } while (str != str_end && wildstr[0] != w_many);
+ } while (str != str_end);
return(-1);
}
}