X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=lib%2Flibnfs.c;h=910e4d2cc5a1b054a22d4df4dcd9789324c96b6f;hb=b41762c0d85faddf7a2d553c164abd6f881be398;hp=61cb29f6c1cc8f3eaf575aabb098f2fd89916020;hpb=b2fc5c54d9510d2f83d556ef871fc0ce3a2fb582;p=deb_libnfs.git

diff --git a/lib/libnfs.c b/lib/libnfs.c
index 61cb29f..910e4d2 100644
--- a/lib/libnfs.c
+++ b/lib/libnfs.c
@@ -524,27 +524,16 @@ int rpc_connect_program_async(struct rpc_context *rpc, char *server, int program
 	return 0;
 }
 
-void free_nfs_cb_data(struct nfs_cb_data *data)
+static void free_nfs_cb_data(struct nfs_cb_data *data)
 {
-	if (data->saved_path != NULL) {
-		free(data->saved_path);
-		data->saved_path = NULL;
-	}
-
 	if (data->continue_data != NULL) {
+		assert(data->free_continue_data);
 		data->free_continue_data(data->continue_data);
-		data->continue_data = NULL;
 	}
 
-	if (data->fh.data.data_val != NULL) {
-		free(data->fh.data.data_val);
-		data->fh.data.data_val = NULL;
-	}
-
-	if (data->buffer != NULL) {
-		free(data->buffer);
-		data->buffer = NULL;
-	}
+	free(data->saved_path);
+	free(data->fh.data.data_val);
+	free(data->buffer);
 
 	free(data);
 }
@@ -1105,6 +1094,8 @@ static int nfs_lookuppath_async(struct nfs_context *nfs, const char *path, nfs_c
 	if (data == NULL) {
 		rpc_set_error(nfs->rpc, "out of memory: failed to allocate "
 			"nfs_cb_data structure");
+		if (free_continue_data)
+			free_continue_data(continue_data);
 		return -1;
 	}
 	memset(data, 0, sizeof(struct nfs_cb_data));
@@ -2369,6 +2360,7 @@ int nfs_creat_async(struct nfs_context *nfs, const char *path, int mode, nfs_cb
 	ptr = strrchr(new_path, '/');
 	if (ptr == NULL) {
 		rpc_set_error(nfs->rpc, "Invalid path %s", path);
+		free(new_path);
 		return -1;
 	}
 	*ptr = 0;
@@ -2590,6 +2582,7 @@ int nfs_mknod_async(struct nfs_context *nfs, const char *path, int mode, int dev
 	ptr = strrchr(cb_data->path, '/');
 	if (ptr == NULL) {
 		rpc_set_error(nfs->rpc, "Invalid path %s", path);
+		free_mknod_cb_data(cb_data);
 		return -1;
 	}
 	*ptr = 0;
@@ -2736,6 +2729,7 @@ static void nfs_opendir2_cb(struct rpc_context *rpc, int status, void *command_d
 		nfsdirent->name = strdup(entry->name);
 		if (nfsdirent->name == NULL) {
 			data->cb(-ENOMEM, nfs, "Failed to allocate dirent->name", data->private_data);
+			free(nfsdirent);
 			nfs_free_nfsdir(nfsdir);
 			data->continue_data = NULL;
 			free_nfs_cb_data(data);
@@ -2795,6 +2789,9 @@ static void nfs_opendir2_cb(struct rpc_context *rpc, int status, void *command_d
 		 	 * commands in flight to complete
 		 	 */
 			if (rdpe_cb_data->getattrcount > 0) {
+				nfs_free_nfsdir(nfsdir);
+				data->continue_data = NULL;
+				free_nfs_cb_data(data);
 				rdpe_cb_data->status = RPC_STATUS_ERROR;
 				free(rdpe_lookup_cb_data);
 				return;
@@ -2812,7 +2809,6 @@ static void nfs_opendir2_cb(struct rpc_context *rpc, int status, void *command_d
 	}
 }
 
-
 static void nfs_opendir_cb(struct rpc_context *rpc, int status, void *command_data, void *private_data)
 {
 	READDIRPLUS3res *res = command_data;
@@ -3316,7 +3312,6 @@ int nfs_fchmod_async(struct nfs_context *nfs, struct nfsfh *nfsfh, int mode, nfs
 	memcpy(data->fh.data.data_val, nfsfh->fh.data.data_val, data->fh.data.data_len);
 
 	if (nfs_chmod_continue_internal(nfs, data) != 0) {
-		free_nfs_cb_data(data);
 		return -1;
 	}
 
@@ -3429,10 +3424,10 @@ int nfs_fchown_async(struct nfs_context *nfs, struct nfsfh *nfsfh, int uid, int
 	chown_data->uid = uid;
 	chown_data->gid = gid;
 
-
 	data = malloc(sizeof(struct nfs_cb_data));
 	if (data == NULL) {
 		rpc_set_error(nfs->rpc, "out of memory. failed to allocate memory for fchown data");
+		free(chown_data);
 		return -1;
 	}
 	memset(data, 0, sizeof(struct nfs_cb_data));
@@ -3440,6 +3435,7 @@ int nfs_fchown_async(struct nfs_context *nfs, struct nfsfh *nfsfh, int uid, int
 	data->cb            = cb;
 	data->private_data  = private_data;
 	data->continue_data = chown_data;
+	data->free_continue_data = free;
 	data->fh.data.data_len = nfsfh->fh.data.data_len;
 	data->fh.data.data_val = malloc(data->fh.data.data_len);
 	if (data->fh.data.data_val == NULL) {
@@ -3449,9 +3445,7 @@ int nfs_fchown_async(struct nfs_context *nfs, struct nfsfh *nfsfh, int uid, int
 	}
 	memcpy(data->fh.data.data_val, nfsfh->fh.data.data_val, data->fh.data.data_len);
 
-
 	if (nfs_chown_continue_internal(nfs, data) != 0) {
-		free_nfs_cb_data(data);
 		return -1;
 	}