From: Arne Redlich Date: Tue, 18 Feb 2014 19:51:36 +0000 (+0100) Subject: nfs_write_async: plug potential memory leaks X-Git-Tag: upstream/1.9.6^2~86 X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=63d4a0583d83c3b335d411c64911905faa35b97f;p=deb_libnfs.git nfs_write_async: plug potential memory leaks Spotted by clang analyzer. This also introduces asserts to help clang analyzer avoid reporting false positives. Signed-off-by: Arne Redlich --- diff --git a/lib/libnfs.c b/lib/libnfs.c index 3660b6c..c697895 100644 --- a/lib/libnfs.c +++ b/lib/libnfs.c @@ -1775,6 +1775,10 @@ int nfs_pwrite_async(struct nfs_context *nfs, struct nfsfh *nfsfh, uint64_t offs return 0; } + /* hello, clang-analyzer */ + assert(count > 0); + assert(data->num_calls == 0); + /* trying to write more than maximum server write size, we has to chop it up into smaller * chunks. * we send all writes in parallel so that performance is still good. @@ -1794,6 +1798,8 @@ int nfs_pwrite_async(struct nfs_context *nfs, struct nfsfh *nfsfh, uint64_t offs mdata = malloc(sizeof(struct nfs_mcb_data)); if (mdata == NULL) { rpc_set_error(nfs->rpc, "out of memory: failed to allocate nfs_mcb_data structure"); + if (data->num_calls == 0) + free_nfs_cb_data(data); return -1; } memset(mdata, 0, sizeof(struct nfs_mcb_data)); @@ -1813,6 +1819,9 @@ int nfs_pwrite_async(struct nfs_context *nfs, struct nfsfh *nfsfh, uint64_t offs rpc_set_error(nfs->rpc, "RPC error: Failed to send WRITE call for %s", data->path); data->cb(-ENOMEM, nfs, rpc_get_error(nfs->rpc), data->private_data); free(mdata); + if (data->num_calls == 0) + free_nfs_cb_data(data); + return -1; }