diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-12-13 00:10:40 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-12-13 00:10:40 +0100 |
| commit | 162399515813a4e23c8735473f9d2dd622a6679b (patch) | |
| tree | 39077fdabea60983c59899ce3d28e84c4d97c7e6 /strings | |
| parent | 5908d7ebb81bc2d52c67e519a4643372cb9f08bd (diff) | |
| parent | 0ed474484c037a32bea32abaecd3ff770f40bd49 (diff) | |
| download | mariadb-git-162399515813a4e23c8735473f9d2dd622a6679b.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/ctype-utf8.c | 2 | ||||
| -rw-r--r-- | strings/decimal.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/strings/ctype-utf8.c b/strings/ctype-utf8.c index d0a64d11c84..bcb07daae03 100644 --- a/strings/ctype-utf8.c +++ b/strings/ctype-utf8.c @@ -7113,7 +7113,7 @@ my_wc_mb_filename(CHARSET_INFO *cs __attribute__((unused)), } /* Non letter */ - if (s + 5 > e) + if (s + 4 > e) return MY_CS_TOOSMALL5; *s++= hex[(wc >> 12) & 15]; diff --git a/strings/decimal.c b/strings/decimal.c index da47727bd9c..2353a8aefce 100644 --- a/strings/decimal.c +++ b/strings/decimal.c @@ -383,6 +383,7 @@ int decimal2string(const decimal_t *from, char *to, int *to_len, } else frac-=j; + frac_len= frac; len= from->sign + intg_len + MY_TEST(frac) + frac_len; } *to_len=len; |