From ff8ab11dacb7e4f4c2cba76af46de88f24336309 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 21 Dec 2009 21:16:15 -0800 Subject: [PATCH] Fix bug 7005 - mangle method = hash truncates files with dot '. ' character Don't change the contents of a const string via a pointer alias (or if you do, change it back.....). Jeremy. (cherry picked from commit e3be5ddae764fae7ff4a3ef502e8461d0535bdc5) --- source/smbd/mangle_hash.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/source/smbd/mangle_hash.c b/source/smbd/mangle_hash.c index 5de69e21ab4..7073c3c64eb 100644 --- a/source/smbd/mangle_hash.c +++ b/source/smbd/mangle_hash.c @@ -432,6 +432,13 @@ static void cache_mangled_name( const char mangled_name[13], if( !s1[i] && !s2[i] ) { /* Truncate at the '.' */ *s1 = '\0'; + /* + * DANGER WILL ROBINSON - this + * is changing a const string via + * an aliased pointer ! Remember to + * put it back once we've used it. + * JRA + */ *s2 = '\0'; } } @@ -443,6 +450,8 @@ static void cache_mangled_name( const char mangled_name[13], } else { DEBUG(5,("cache_mangled_name: Stored entry %s -> %s\n", mangled_name_key, raw_name)); } + /* Restore the change we made to the const string. */ + *s2 = '.'; } /* ************************************************************************** ** -- 2.11.4.GIT