diff options
| author | Chad MILLER <chad@mysql.com> | 2008-08-18 13:11:55 -0400 |
|---|---|---|
| committer | Chad MILLER <chad@mysql.com> | 2008-08-18 13:11:55 -0400 |
| commit | 10ae3ae1c8f7fe3a91caf4e1eeeefe34a9343b54 (patch) | |
| tree | 51f200075f2a24d7dd93cee55a181d7784df57a1 /mysys/mf_pack.c | |
| parent | 780fee586ddb0c9c46e848c5204a19e48335a702 (diff) | |
| parent | ace51b79f176cdcfc1070ec4a7924b7a70a0b9bf (diff) | |
| download | mariadb-git-10ae3ae1c8f7fe3a91caf4e1eeeefe34a9343b54.tar.gz | |
Merge from 5.0-bugteam local.
Diffstat (limited to 'mysys/mf_pack.c')
| -rw-r--r-- | mysys/mf_pack.c | 2 |
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); |