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)

diff --git a/source/smbd/mangle_hash.c b/source/smbd/mangle_hash.c
index 5de69e21ab419fa60522240e22bea1ba8c42fa80..7073c3c64eb4129f3acdd5a22e7f3c4cc8a9e317 100644 (file)
--- 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 = '.';
 }
 
 /* ************************************************************************** **