merge 6.0p1

1 files changed, 2 insertions, 1 deletions

diff --git a/monitor.c b/monitor.c
index 2d46b7b79..ff5547e0e 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor.c,v 1.115 2011/06/23 23:35:42 djm Exp $ */
+/* $OpenBSD: monitor.c,v 1.116 2012/01/05 00:16:56 djm Exp $ */
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
  * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -524,6 +524,7 @@ monitor_read_log(struct monitor *pmonitor)
         if (atomicio(read, pmonitor->m_log_recvfd,
             buffer_ptr(&logmsg), buffer_len(&logmsg)) != buffer_len(&logmsg)) {
                 if (errno == EPIPE) {
+                        buffer_free(&logmsg);
                         debug("%s: child log fd closed", __func__);
                         close(pmonitor->m_log_recvfd);
                         pmonitor->m_log_recvfd = -1;