Valgrind found a few memory leaks!

Andrew Bartlett

diff --git a/source/lib/gencache.c b/source/lib/gencache.c
index eb0e0cd808f027eac0f45622e89c8d21bcb36d85..40b4d1390dcd8deb6b685efe6bf345f24fb16e9d 100644 (file)
--- a/source/lib/gencache.c
+++ b/source/lib/gencache.c
@@ -114,6 +114,9 @@ BOOL gencache_set(const char *keystr, const char *value, time_t timeout)
        if (!gencache_init()) return False;
        
        asprintf(&valstr, CACHE_DATA_FMT, (int)timeout, value);
+       if (!valstr)
+               return False;
+
        keybuf.dptr = strdup(keystr);
        keybuf.dsize = strlen(keystr)+1;
        databuf.dptr = strdup(valstr);
@@ -241,6 +244,7 @@ BOOL gencache_get(const char *keystr, char **valstr, time_t *timeout)
        keybuf.dptr = strdup(keystr);
        keybuf.dsize = strlen(keystr)+1;
        databuf = tdb_fetch(cache, keybuf);
+       SAFE_FREE(keybuf.dptr);
        
        if (databuf.dptr && databuf.dsize > TIMEOUT_LEN) {
                char* entry_buf = strndup(databuf.dptr, databuf.dsize);

diff --git a/source/libsmb/namecache.c b/source/libsmb/namecache.c
index 40777011a1d07ac64fd81e06df7d73f28cc50243..d3541b7719d9a991ea030c89406f0415936d96e6 100644 (file)
--- a/source/libsmb/namecache.c
+++ b/source/libsmb/namecache.c
@@ -118,6 +118,7 @@ BOOL namecache_store(const char *name, int name_type,
        time_t expiry;
        char *key, *value_string;
        int i;
+       BOOL ret;
 
        /*
         * we use gecache call to avoid annoying debug messages about
@@ -152,10 +153,17 @@ BOOL namecache_store(const char *name, int name_type,
         * First, store the number of ip addresses and then
         * place each single ip
         */
-       ipstr_list_make(&value_string, ip_list, num_names);
+       if (!ipstr_list_make(&value_string, ip_list, num_names)) {
+               SAFE_FREE(key);
+               SAFE_FREE(value_string);
+               return False;
+       }
        
        /* set the entry */
-       return (gencache_set(key, value_string, expiry));
+       ret = gencache_set(key, value_string, expiry);
+       SAFE_FREE(key);
+       SAFE_FREE(value_string);
+       return ret;
 }
 
 

diff --git a/source/param/loadparm.c b/source/param/loadparm.c
index f8a19905137996f7242d85fb777f7f569a6ca143..0aa5f08be77dc99f4007d3e0ce0039798990d011 100644 (file)
--- a/source/param/loadparm.c
+++ b/source/param/loadparm.c
@@ -3183,6 +3183,7 @@ BOOL lp_do_parameter(int snum, const char *pszParmName, const char *pszParmValue
                        break;
 
                case P_LIST:
+                       str_list_free(parm_ptr);
                        *(char ***)parm_ptr = str_list_make(pszParmValue, NULL);
                        break;