[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  0cd4561 namecache: fix uninitialised pointer returns
      from  27b2ddc docs: mention incompatibility between kernel oplocks and streams_xattr

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


- Log -----------------------------------------------------------------
commit 0cd4561ab14f745b63d8ed288e0752e1206e1cff
Author: David Disseldorp <ddiss at samba.org>
Date:   Fri Sep 12 13:11:00 2014 +0200

    namecache: fix uninitialised pointer returns
    
    asprintf_strupper_m() doesn't set *strp on error.
    
    Signed-off-by: David Disseldorp <ddiss at samba.org>
    Reviewed-by: Volker Lendecke <Volker.Lendecke at SerNet.DE>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Sat Sep 13 03:21:39 CEST 2014 on sn-devel-104

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

Summary of changes:
 source3/libsmb/namecache.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/namecache.c b/source3/libsmb/namecache.c
index 1e61584..f325c34 100644
--- a/source3/libsmb/namecache.c
+++ b/source3/libsmb/namecache.c
@@ -37,10 +37,10 @@
  *         type number
  */
 
-static char* namecache_key(const char *name,
+static char *namecache_key(const char *name,
 				int name_type)
 {
-	char *keystr;
+	char *keystr = NULL;
 	asprintf_strupper_m(&keystr, NBTKEY_FMT, name, name_type);
 
 	return keystr;
@@ -239,7 +239,7 @@ static char *namecache_status_record_key(const char *name,
 				const struct sockaddr_storage *keyip)
 {
 	char addr[INET6_ADDRSTRLEN];
-	char *keystr;
+	char *keystr = NULL;
 
 	print_sockaddr(addr, sizeof(addr), keyip);
 	asprintf_strupper_m(&keystr, "NBT/%s#%02X.%02X.%s", name,


-- 
Samba Shared Repository