diff options
author | Jeremy Allison <jra@samba.org> | 2007-03-01 02:43:33 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:18:16 -0500 |
commit | 8e00e9d7a6114089fc176bc3446c6c97a01543d6 (patch) | |
tree | 9c5b58be176c12282be1226dd4369cb80a66bb6b /source3/utils/net_ads.c | |
parent | fae01b48994fd3168fd921af68dab1b4003adc49 (diff) | |
download | samba-8e00e9d7a6114089fc176bc3446c6c97a01543d6.tar.gz samba-8e00e9d7a6114089fc176bc3446c6c97a01543d6.tar.bz2 samba-8e00e9d7a6114089fc176bc3446c6c97a01543d6.zip |
r21609: Fix memory leaks in error code paths (and one in winbindd_group.c).
Patch from Zack Kirsch <zack.kirsch@isilon.com>.
Jeremy.
(This used to be commit df07a662e32367a52c1e8473475423db2ff5bc51)
Diffstat (limited to 'source3/utils/net_ads.c')
-rw-r--r-- | source3/utils/net_ads.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c index b1ac40fd72..363bfbc666 100644 --- a/source3/utils/net_ads.c +++ b/source3/utils/net_ads.c @@ -1823,10 +1823,12 @@ static int net_ads_printer_publish(int argc, const char **argv) LDAPMessage *res = NULL; if (!ADS_ERR_OK(ads_startup(True, &ads))) { + talloc_destroy(mem_ctx); return -1; } if (argc < 1) { + talloc_destroy(mem_ctx); return net_ads_printer_usage(argc, argv); } @@ -1854,6 +1856,7 @@ static int net_ads_printer_publish(int argc, const char **argv) d_fprintf(stderr, "Unable to open a connnection to %s to obtain data " "for %s\n", servername, printername); ads_destroy(&ads); + talloc_destroy(mem_ctx); return -1; } @@ -1865,6 +1868,7 @@ static int net_ads_printer_publish(int argc, const char **argv) d_fprintf(stderr, "Could not find machine account for server %s\n", servername); ads_destroy(&ads); + talloc_destroy(mem_ctx); return -1; } @@ -1878,6 +1882,7 @@ static int net_ads_printer_publish(int argc, const char **argv) SAFE_FREE(printername_escaped); d_fprintf(stderr, "Internal error, out of memory!"); ads_destroy(&ads); + talloc_destroy(mem_ctx); return -1; } @@ -1892,6 +1897,7 @@ static int net_ads_printer_publish(int argc, const char **argv) servername); SAFE_FREE(prt_dn); ads_destroy(&ads); + talloc_destroy(mem_ctx); return -1; } @@ -1899,6 +1905,7 @@ static int net_ads_printer_publish(int argc, const char **argv) printername))) { SAFE_FREE(prt_dn); ads_destroy(&ads); + talloc_destroy(mem_ctx); return -1; } @@ -1907,12 +1914,14 @@ static int net_ads_printer_publish(int argc, const char **argv) d_fprintf(stderr, "ads_publish_printer: %s\n", ads_errstr(rc)); SAFE_FREE(prt_dn); ads_destroy(&ads); + talloc_destroy(mem_ctx); return -1; } d_printf("published printer\n"); SAFE_FREE(prt_dn); ads_destroy(&ads); + talloc_destroy(mem_ctx); return 0; } |