r18639@catbus: nickm | 2008-03-07 20:11:48 -0500

 Change semantics of add-a-log functions to copy severity setup: that is way less error-prone.  Fix up config.c to act accordingly.


svn:r13888

1 files changed, 4 insertions, 5 deletions

diff --git a/src/common/log.c b/src/common/log.c
index 6c63019f7c..80f413c0ae 100644
--- a/src/common/log.c
+++ b/src/common/log.c
@@ -480,8 +480,7 @@ new_severity_list(int loglevelMin, int loglevelMax)
 }
 
 /** Add a log handler named <b>name</b> to send all messages in <b>severity</b>
- * to <b>stream</b>. Steals a reference to <b>severity</b>; the caller must
- * not use it after calling this function. Helper: does no locking. */
+ * to <b>stream</b>. Copies <b>severity</b>. Helper: does no locking. */
 static void
 add_stream_log_impl(log_severity_list_t *severity,
                     const char *name, FILE *stream)
@@ -489,7 +488,7 @@ add_stream_log_impl(log_severity_list_t *severity,
   logfile_t *lf;
   lf = tor_malloc_zero(sizeof(logfile_t));
   lf->filename = tor_strdup(name);
-  lf->severities = severity;
+  lf->severities = tor_memdup(severity, sizeof(log_severity_list_t));
   lf->file = stream;
   lf->next = logfiles;
 
@@ -539,7 +538,7 @@ add_callback_log(log_severity_list_t *severity, log_callback cb)
 {
   logfile_t *lf;
   lf = tor_malloc_zero(sizeof(logfile_t));
-  lf->severities = severity;
+  lf->severities = tor_memdup(severity, sizeof(log_severity_list_t));
   lf->filename = tor_strdup("<callback>");
   lf->callback = cb;
   lf->next = logfiles;
@@ -657,7 +656,7 @@ add_syslog_log(log_severity_list_t *severity)
     openlog("Tor", LOG_PID | LOG_NDELAY, LOGFACILITY);
 
   lf = tor_malloc_zero(sizeof(logfile_t));
-  lf->severities = severity;
+  lf->severities = tor_memdup(severity, sizeof(log_severity_list_t));
   lf->filename = tor_strdup("<syslog>");
 
   lf->is_syslog = 1;