From b72fbaf99fd8d40fe0bf38c81bf5f5921c762141 Mon Sep 17 00:00:00 2001 From: Jon Siwek Date: Thu, 24 Jan 2013 10:26:54 -0600 Subject: [PATCH] Fix memory leak in some reporter messaging cases. Related to the changes in fdd11428. --- src/Reporter.cc | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/Reporter.cc b/src/Reporter.cc index fc3dde3ca0..6bc2577c72 100644 --- a/src/Reporter.cc +++ b/src/Reporter.cc @@ -320,6 +320,14 @@ void Reporter::DoLog(const char* prefix, EventHandlerPtr event, FILE* out, else mgr.QueueEvent(event, vl); } + else + { + if ( addl ) + { + loop_over_list(*addl, i) + Unref((*addl)[i]); + } + } if ( out ) { @@ -351,12 +359,6 @@ void Reporter::DoLog(const char* prefix, EventHandlerPtr event, FILE* out, if ( out ) fprintf(out, "%s", s.c_str()); - - if ( addl ) - { - loop_over_list(*addl, i) - Unref((*addl)[i]); - } } if ( alloced )