From: Zdenek Kabelac <zkabelac@redhat.com>
Date: Mon, 27 Feb 2012 11:49:16 +0000 (+0000)
Subject: Do not hide deallocation of buffer
X-Git-Tag: v2_02_96~287
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=5627fc8e7b41e481cf1daf64432d1b44c9d6a072;p=lvm2.git

Do not hide deallocation of buffer

As API is passing structures by value, do not leave
the function which created buffer and keeps valid pointer
look like it would be some memory leak and move
free of buffer from inner function - makes more obvious,
how is the memory management handled.
---

diff --git a/daemons/common/daemon-client.c b/daemons/common/daemon-client.c
index 08821a73c..558f770ea 100644
--- a/daemons/common/daemon-client.c
+++ b/daemons/common/daemon-client.c
@@ -62,8 +62,6 @@ daemon_reply daemon_send(daemon_handle h, daemon_request rq)
 	if (!write_buffer(h.socket_fd, rq.buffer, strlen(rq.buffer)))
 		reply.error = errno;
 
-	dm_free(rq.buffer);
-
 	if (read_buffer(h.socket_fd, &reply.buffer)) {
 		reply.cft = dm_config_from_string(reply.buffer);
 	} else
@@ -93,6 +91,8 @@ daemon_reply daemon_send_simple(daemon_handle h, const char *id, ...)
 		return err;
 
 	repl = daemon_send(h, rq);
+	dm_free(rq.buffer);
+
 	return repl;
 }