summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authorTatiana A. Nurnberg <azundris@mysql.com>2008-08-19 16:26:24 +0200
committerTatiana A. Nurnberg <azundris@mysql.com>2008-08-19 16:26:24 +0200
commit5e28432cd370660c75df3de2d3e62dfd9c75b369 (patch)
tree5f8a6767c8b416e12a71661c9f4022fd25fd97ef /mysys
parentbd7274415cb437949d6a419fc71cd713578984ae (diff)
parent89328c8ceff524d1cabd03f360eb5eba17b099fc (diff)
downloadmariadb-git-5e28432cd370660c75df3de2d3e62dfd9c75b369.tar.gz
auto-merged
Diffstat (limited to 'mysys')
-rw-r--r--mysys/mf_pack.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/mf_pack.c b/mysys/mf_pack.c
index bed9968063a..d4828946d82 100644
--- a/mysys/mf_pack.c
+++ b/mysys/mf_pack.c
@@ -354,7 +354,7 @@ size_t unpack_dirname(char * to, const char *from)
length-= (size_t) (suffix-buff)-1;
if (length+(h_length= strlen(tilde_expansion)) <= FN_REFLEN)
{
- if (tilde_expansion[h_length-1] == FN_LIBCHAR)
+ if ((h_length > 0) && (tilde_expansion[h_length-1] == FN_LIBCHAR))
h_length--;
if (buff+h_length < suffix)
bmove(buff+h_length,suffix,length);