Attachment 152919 Details for Bug 236844 – libdevmapper-event-leak-fix.patch

[patch] libdevmapper-event-leak-fix.patch

libdevmapper-event-leak-fix.patch (text/plain), 1.87 KB, created by Petr Rockai on 2007-04-18 15:57:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Petr Rockai

Created: 2007-04-18 15:57:51 UTC

Size: 1.87 KB

patch

obsolete

>Wed Apr 18 17:12:35 CEST 2007  me@mornfall.net
>  * resolve conflicts
>Wed Apr 18 17:01:32 CEST 2007  me@mornfall.net
>  * reset to 0
>Wed Apr 18 16:58:12 CEST 2007  me@mornfall.net
>  * more leak fixes...
>Wed Apr 18 01:14:43 CEST 2007  me@mornfall.net
>  * minor correction to the leak fix
>Wed Apr 18 01:14:03 CEST 2007  me@mornfall.net
>  * (hopefully) fix memory leak
>diff -rN -p -u old-libdevmapper-event-leaks/dmeventd/libdevmapper-event.c new-libdevmapper-event-leaks/dmeventd/libdevmapper-event.c
>--- old-libdevmapper-event-leaks/dmeventd/libdevmapper-event.c	2007-04-18 17:56:42.229198950 +0200
>+++ new-libdevmapper-event-leaks/dmeventd/libdevmapper-event.c	2007-04-18 17:56:42.229198950 +0200
>@@ -358,10 +358,17 @@ static int _daemon_talk(struct dm_event_
> 	 */
> 	if (!_daemon_write(fifos, msg)) {
> 		stack;
>+		dm_free(msg->data);
>+		msg->data = 0;
> 		return -EIO;
> 	}
> 
> 	do {
>+
>+		if (msg->data)
>+			dm_free(msg->data);
>+		msg->data = 0;
>+
> 		if (!_daemon_read(fifos, msg)) {
> 			stack;
> 			return -EIO;
>@@ -546,6 +553,11 @@ static int _do_event(int cmd, struct dm_
> 	}
> 
> 	ret = _daemon_talk(&fifos, msg, DM_EVENT_CMD_HELLO, 0, 0, 0, 0);
>+
>+	if (msg->data)
>+		dm_free(msg->data);
>+	msg->data = 0;
>+
> 	if (!ret)
> 		ret = _daemon_talk(&fifos, msg, cmd, dso_name, dev_name, evmask, timeout);
> 
>@@ -712,6 +724,12 @@ int dm_event_get_registered_device(struc
> 
> 	dm_event_handler_set_dso(dmevh, reply_dso);
> 	dm_event_handler_set_event_mask(dmevh, reply_mask);
>+
>+	if (reply_dso)
>+		dm_free(reply_dso);
>+	if (reply_uuid)
>+		dm_free(reply_uuid);
>+
> 	dmevh->dev_name = dm_strdup(dm_task_get_name(dmt));
> 	if (!dmevh->dev_name) {
> 		ret = -ENOMEM;
>@@ -734,6 +752,10 @@ int dm_event_get_registered_device(struc
>  fail:
> 	if (msg.data)
> 		dm_free(msg.data);
>+	if (reply_dso)
>+		dm_free(reply_dso);
>+	if (reply_uuid)
>+		dm_free(reply_uuid);
> 	_dm_event_handler_clear_dev_info(dmevh);
> 	dm_task_destroy(dmt);
> 	return ret;
>

Actions: View | Diff

Attachments on bug 236844: 152914 | 152919