From e670d25fb0819ee54be6dd0e1e1ce24810997dd7 Mon Sep 17 00:00:00 2001 From: Gene Cumm Date: Thu, 23 Sep 2010 21:51:14 -0400 Subject: [PATCH] core: fix handling new directory "/" for CONFIG in ISOLINUX and EXTLINUX --- core/fs/iso9660/iso9660.c | 2 ++ core/fs/lib/mangle.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/core/fs/iso9660/iso9660.c b/core/fs/iso9660/iso9660.c index 62137d0..46f5f17 100644 --- a/core/fs/iso9660/iso9660.c +++ b/core/fs/iso9660/iso9660.c @@ -63,6 +63,8 @@ static void iso_mangle_name(char *dst, const char *src) if ( (*(dst-1) != '.') && (*(dst-1) != '/') ) break; + if ((dst[-1] == '/') && ((dst - 1) == p)) + break; dst --; i ++; diff --git a/core/fs/lib/mangle.c b/core/fs/lib/mangle.c index 813099f..8c2077a 100644 --- a/core/fs/lib/mangle.c +++ b/core/fs/lib/mangle.c @@ -36,6 +36,8 @@ void generic_mangle_name(char *dst, const char *src) break; if (dst[-1] != '/') break; + if ((dst[-1] == '/') && ((dst - 1) == p)) + break; dst--; i++; -- 2.7.4