mirror of
https://github.com/MariaDB/server.git
synced 2026-05-14 19:07:15 +02:00
auto-merged
This commit is contained in:
commit
fd548d585d
25 changed files with 764 additions and 74 deletions
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue