1 files changed, 2 insertions, 1 deletions
diff --git a/mysys/mf_pack.c b/mysys/mf_pack.c
index c6e6a3a429e..a9482187138 100644
--- a/mysys/mf_pack.c
+++ b/mysys/mf_pack.c
@@ -192,7 +192,8 @@ size_t cleanup_dirname(register char *to, const char *from)
 	  end_parentdir=pos;
 	  while (pos >= start && *pos != FN_LIBCHAR)	/* remove prev dir */
 	    pos--;
-	  if (pos[1] == FN_HOMELIB || memcmp(pos,parent,length) == 0)
+          if (pos[1] == FN_HOMELIB ||
+              (pos > start && memcmp(pos, parent, length) == 0))
 	  {					/* Don't remove ~user/ */
 	    pos=strmov(end_parentdir+1,parent);
 	    *pos=FN_LIBCHAR;