Module Name: src
Committed By: mlelstv
Date: Thu Dec 27 14:05:54 UTC 2018
Modified Files:
src/lib/libdm: libdm_ioctl.c
Log Message:
Clean up double free in some error paths that did trigger
an assertion in libprop.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/libdm/libdm_ioctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libdm/libdm_ioctl.c
diff -u src/lib/libdm/libdm_ioctl.c:1.2 src/lib/libdm/libdm_ioctl.c:1.3
--- src/lib/libdm/libdm_ioctl.c:1.2 Mon May 30 01:10:57 2011
+++ src/lib/libdm/libdm_ioctl.c Thu Dec 27 14:05:54 2018
@@ -165,8 +165,6 @@ libdm_task_run(libdm_task_t libdm_task)
error = rump_sys_ioctl(libdm_control_fd, NETBSD_DM_IOCTL, &prefp);
if (error < 0) {
- libdm_task_destroy(libdm_task);
- libdm_task = NULL;
libdm_control_close(libdm_control_fd);
return error;
@@ -177,8 +175,6 @@ libdm_task_run(libdm_task_t libdm_task)
error = prop_dictionary_sendrecv_ioctl(libdm_task->ldm_task,
libdm_control_fd, NETBSD_DM_IOCTL, &dict);
if ( error != 0) {
- libdm_task_destroy(libdm_task);
- libdm_task = NULL;
libdm_control_close(libdm_control_fd);
return error;
}
