[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  100168d... Fix bug reported in mangle_hash code (no bugid yet).
      from  fd5350d... s4 torture: Add RAW-OPLOCK-EXCLUSIVE7 which is similar 
to BATCH19

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 100168dfec533a7afd8f2dd246f1b66b11ad7162
Author: Jeremy Allison <j...@samba.org>
Date:   Mon Dec 21 17:46:32 2009 -0800

    Fix bug reported in mangle_hash code (no bugid yet).
    
    Don't change the contents of a const string via a pointer
    alias (or if you do, change it back.....).
    
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source3/smbd/mangle_hash.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/mangle_hash.c b/source3/smbd/mangle_hash.c
index c08bc40..8369af4 100644
--- a/source3/smbd/mangle_hash.c
+++ b/source3/smbd/mangle_hash.c
@@ -429,6 +429,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';
                }
        }
@@ -440,6 +447,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 = '.';
 }
 
 /* ************************************************************************** 
**


-- 
Samba Shared Repository