[SCM] Samba Shared Repository - branch v3-3-test updated

[Karolin Seeger]

The branch, v3-3-test has been updated
       via  e904ccd... Fix bug #7154 - mangling method = hash can crash storing a name not containing a '.'
      from  80d9663... Fix bug #7155 - valgrind Conditional jump or move depends on uninitialised value(s) error when "mangling method = hash"

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit e904ccd25a3b7050a8d1895c9535e42abd0b4d07
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Feb 18 11:22:44 2010 -0800

    Fix bug #7154 - mangling method = hash can crash storing a name not containing a '.'
    
    Fix use of uninitialized variable. This can lead to crashes if
    mangling = hash processes names with no '.'.
    
    Jeremy.
    (cherry picked from commit df13b1303a751962d8f7d5298b39e4a7500fef15)

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

Summary of changes:
 source/smbd/mangle_hash.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/smbd/mangle_hash.c b/source/smbd/mangle_hash.c
index e081a57..31e734d 100644
--- a/source/smbd/mangle_hash.c
+++ b/source/smbd/mangle_hash.c
@@ -412,8 +412,8 @@ static void cache_mangled_name( const char mangled_name[13],
 {
 	TDB_DATA data_val;
 	char mangled_name_key[13];
-	char *s1;
-	char *s2;
+	char *s1 = NULL;
+	char *s2 = NULL;
 
 	/* If the cache isn't initialized, give up. */
 	if( !tdb_mangled_cache )
@@ -452,7 +452,9 @@ static void cache_mangled_name( const char mangled_name[13],
 		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 = '.';
+	if (s2) {
+		*s2 = '.';
+	}
 }
 
 /* ************************************************************************** **


-- 
Samba Shared Repository