X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=lib%2Flibnfs.c;h=66f13a3493cca78eb3e52b9bd585e3071c01898f;hb=c8f0bac1bbe9b0e70607979d51b74e59304fcc41;hp=b2502ba8fa5ad2d066bc04deb301c7c492caa88b;hpb=bcbb21cdbb66e36fc4ef77559282aaf2242fe7b0;p=deb_libnfs.git

diff --git a/lib/libnfs.c b/lib/libnfs.c
index b2502ba..66f13a3 100644
--- a/lib/libnfs.c
+++ b/lib/libnfs.c
@@ -1578,6 +1578,9 @@ int nfs_pread_async(struct nfs_context *nfs, struct nfsfh *nfsfh, uint64_t offse
 		return 0;
 	}
 
+	assert(count > 0);
+	assert(data->num_calls == 0);
+
 	/* trying to read more than maximum server read size, we has to chop it up into smaller
 	 * reads and collect into a reassembly buffer.
 	 * we send all reads in parallel so that performance is still good.
@@ -1605,6 +1608,8 @@ int nfs_pread_async(struct nfs_context *nfs, struct nfsfh *nfsfh, uint64_t offse
 		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));
@@ -1621,6 +1626,8 @@ int nfs_pread_async(struct nfs_context *nfs, struct nfsfh *nfsfh, uint64_t offse
 			rpc_set_error(nfs->rpc, "RPC error: Failed to send READ 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;
 		}
 
@@ -1775,6 +1782,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 +1805,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 +1826,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;
 		}
 
@@ -3889,19 +3905,28 @@ static int nfs_rename_continue_2_internal(struct nfs_context *nfs, struct nfs_cb
 static int nfs_rename_continue_1_internal(struct nfs_context *nfs, struct nfs_cb_data *data)
 {
 	struct nfs_rename_data *rename_data = data->continue_data;
+	char* newpath = strdup(rename_data->newpath);
+	if (!newpath) {
+		rpc_set_error(nfs->rpc, "Out of memory. Could not allocate memory to store target path for rename");
+		data->cb(-ENOMEM, nfs, rpc_get_error(nfs->rpc), data->private_data);
+		free_nfs_cb_data(data);
+		return -1;
+	}
 
 	/* steal the filehandle */
 	rename_data->olddir = data->fh;
 	data->fh.data.data_val = NULL;
 
 	if (nfs_lookuppath_async(nfs, rename_data->newpath, data->cb, data->private_data, nfs_rename_continue_2_internal, rename_data, free_nfs_rename_data, 0) != 0) {
-		rpc_set_error(nfs->rpc, "RPC error: Failed to send LOOKUP call for %s", rename_data->newpath);
+		rpc_set_error(nfs->rpc, "RPC error: Failed to send LOOKUP call for %s", newpath);
 		data->cb(-ENOMEM, nfs, rpc_get_error(nfs->rpc), data->private_data);
 		free_nfs_cb_data(data);
+		free(newpath);
 		return -1;
 	}
 	data->continue_data = NULL;
 	free_nfs_cb_data(data);
+	free(newpath);
 
 	return 0;
 }