From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 12 May 2011 02:05:41 +0000 (-0400)
Subject: Fix crash when read_file_to_string() fails in SAVECONF
X-Git-Tag: tor-0.2.1.31~15^2~1^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=13847b8db6b676c4f2951a4195758f395b7551a8;p=thirdparty%2Ftor.git

Fix crash when read_file_to_string() fails in SAVECONF

The new behavior is to try to rename the old file if there is one there
that we can't read.  In all likelihood, that will fail too, but at least
we tried, and at least it won't crash.
---

diff --git a/changes/bug3135 b/changes/bug3135
new file mode 100644
index 0000000000..d761123480
--- /dev/null
+++ b/changes/bug3135
@@ -0,0 +1,6 @@
+  o Minor bugfixes
+    - Do not crash when our configuration file becomes unreadable
+      (usually due to a permissions change) between when we start
+      up and when a controller calls SAVECONF.  Fixes bug 3135;
+      bugfix on 0.0.9pre6.
+
diff --git a/src/or/config.c b/src/or/config.c
index 9cd8149ce8..fbfa771ed3 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -4625,7 +4625,7 @@ write_configuration_file(const char *fname, or_options_t *options)
   switch (file_status(fname)) {
     case FN_FILE:
       old_val = read_file_to_str(fname, 0, NULL);
-      if (strcmpstart(old_val, GENERATED_FILE_PREFIX)) {
+      if (!old_val || strcmpstart(old_val, GENERATED_FILE_PREFIX)) {
         rename_old = 1;
       }
       tor_free(old_val);