From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 16 Jan 2015 16:46:20 +0000 (-0500)
Subject: changes suggested by weasel
X-Git-Tag: tor-0.2.6.3-alpha~136^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=31838bd7833b231e818fed7c1774cee8bd6ca4d7;p=thirdparty%2Ftor.git

changes suggested by weasel
---

diff --git a/src/or/config.c b/src/or/config.c
index 5bd5ff4770..b9a567b741 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -6441,8 +6441,6 @@ write_configuration_file(const char *fname, const or_options_t *options)
   if (!fname)
     return -1;
 
-  tor_assert(fname);
-
   switch (file_status(fname)) {
     case FN_FILE:
       old_val = read_file_to_str(fname, 0, NULL);
diff --git a/src/or/control.c b/src/or/control.c
index 21d2e09856..a569c962c4 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -1439,11 +1439,13 @@ getinfo_helper_misc(control_connection_t *conn, const char *question,
   if (!strcmp(question, "version")) {
     *answer = tor_strdup(get_version());
   } else if (!strcmp(question, "config-file")) {
-    if (get_torrc_fname(0))
-      *answer = tor_strdup(get_torrc_fname(0));
+    const char *a = get_torrc_fname(0);
+    if (a)
+      *answer = tor_strdup(a);
   } else if (!strcmp(question, "config-defaults-file")) {
-    if (get_torrc_fname(1))
-      *answer = tor_strdup(get_torrc_fname(1));
+    const char *a = get_torrc_fname(1);
+    if (a)
+      *answer = tor_strdup(a);
   } else if (!strcmp(question, "config-text")) {
     *answer = options_dump(get_options(), OPTIONS_DUMP_MINIMAL);
   } else if (!strcmp(question, "info/names")) {