diff options
| author | Jeremy Allison <jra@samba.org> | 2010-02-18 11:22:44 -0800 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2010-02-19 14:32:29 +0100 |
| commit | 13b11ec1cd78d9b84117d07083ca7b0ae8ddb8e8 (patch) | |
| tree | decce76e366722e10039dfb537ae0286adf5bf91 | |
| parent | 3f2d27f7b3a4528be5dc58b4bb05201c6ffc4825 (diff) | |
| download | samba-13b11ec1cd78d9b84117d07083ca7b0ae8ddb8e8.tar.gz | |
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)
(cherry picked from commit 7122d0e97ca9edeea28c9e898e77f576a886471e)
| -rw-r--r-- | source3/smbd/mangle_hash.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source3/smbd/mangle_hash.c b/source3/smbd/mangle_hash.c index b54dd5c2978..d1af0994a8c 100644 --- a/source3/smbd/mangle_hash.c +++ b/source3/smbd/mangle_hash.c @@ -409,8 +409,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 ) @@ -449,7 +449,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 = '.'; + } } /* ************************************************************************** ** |