Janitor for tpot yet again... Merging in memory leak fix.

Jeremy.

diff --git a/source/printing/nt_printing.c b/source/printing/nt_printing.c
index e37238c2ce9b05f24c5f90b0f7499e5a04f47331..00d1eaacd3f4c8db8194daadcb095d3236f747e0 100644 (file)
--- a/source/printing/nt_printing.c
+++ b/source/printing/nt_printing.c
@@ -2830,6 +2830,7 @@ static int unpack_values(NT_PRINTER_DATA *printer_data, char *buf, int buflen)
                
                regval_ctr_addvalue( &printer_data->keys[key_index].values, valuename, type, data_p, size );
 
+               SAFE_FREE(data_p); /* 'B' option to tdb_unpack does a malloc() */
                DEBUG(8,("specific: [%s:%s], len: %d\n", keyname, valuename, size));
        }
 
@@ -4382,9 +4383,8 @@ BOOL nt_printing_getsec(TALLOC_CTX *ctx, const char *printername, SEC_DESC_BUF *
        fstring key;
        char *temp;
 
-       if ((temp = strchr(printername + 2, '\\'))) {
+       if (strlen(printername) > 2 && (temp = strchr(printername + 2, '\\')))
                printername = temp + 1;
-       }
 
        /* Fetch security descriptor from tdb */