summaryrefslogtreecommitdiff
path: root/source3/libsmb/namecache.c
diff options
context:
space:
mode:
authorDavid Disseldorp <ddiss@samba.org>2014-09-12 13:11:00 +0200
committerJeremy Allison <jra@samba.org>2014-09-13 03:21:39 +0200
commit0cd4561ab14f745b63d8ed288e0752e1206e1cff (patch)
tree53c231ae42c06b78fa22a369cd24542fc0e22fb5 /source3/libsmb/namecache.c
parent27b2ddcddea5c32a84016b5c6843eb37d2798adf (diff)
downloadsamba-0cd4561ab14f745b63d8ed288e0752e1206e1cff.tar.gz
namecache: fix uninitialised pointer returns
asprintf_strupper_m() doesn't set *strp on error. Signed-off-by: David Disseldorp <ddiss@samba.org> Reviewed-by: Volker Lendecke <Volker.Lendecke@SerNet.DE> Autobuild-User(master): Jeremy Allison <jra@samba.org> Autobuild-Date(master): Sat Sep 13 03:21:39 CEST 2014 on sn-devel-104
Diffstat (limited to 'source3/libsmb/namecache.c')
-rw-r--r--source3/libsmb/namecache.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/libsmb/namecache.c b/source3/libsmb/namecache.c
index 1e6158444dc..f325c346898 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,