Merge pull request #1523 from furiel/invalid-read

Invalid read in system source/nvtable and in file destination
syslog-ng · Jun 14, 2017 · c6bf2e2 · c6bf2e2
2 parents 1b3145a + 559be1f
commit c6bf2e2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/lib/logwriter.c b/lib/logwriter.c
@@ -1357,6 +1357,9 @@ log_writer_deinit(LogPipe *s)
   log_writer_stop_watches(self);
   iv_event_unregister(&self->queue_filled);
 
+  if (iv_timer_registered(&self->reopen_timer))
+    iv_timer_unregister(&self->reopen_timer);
+
   ml_batched_timer_unregister(&self->suppress_timer);
   ml_batched_timer_unregister(&self->mark_timer);
 

diff --git a/modules/systemd-journal/journal-reader.c b/modules/systemd-journal/journal-reader.c
@@ -224,17 +224,21 @@ static void
 _set_program(JournalReaderOptions *options, LogMessage *msg)
 {
   gssize value_length = 0;
-  const gchar *value = _get_value_from_message(options, msg, "SYSLOG_IDENTIFIER", &value_length);
+  /* g_strdup: referred value can change during log_msg_set_value if nvtable realloc needed */
+  gchar *value = g_strdup(_get_value_from_message(options, msg, "SYSLOG_IDENTIFIER", &value_length));
 
   if (value_length > 0)
     {
       log_msg_set_value(msg, LM_V_PROGRAM, value, value_length);
     }
   else
     {
-      value = _get_value_from_message(options, msg, "_COMM", &value_length);
+      value = g_strdup(_get_value_from_message(options, msg, "_COMM", &value_length));
       log_msg_set_value(msg, LM_V_PROGRAM, value, value_length);
     }
+
+  g_free(value);
+
 }
 
 static void