Stop trying to remove NULL filenames on shutdown

Fixes bug 24762; bugfix on master.
(Not in any released version of Tor.)

diff --git a/changes/bug24762 b/changes/bug24762
new file mode 100644 (file)
index 0000000..e9d3bad
--- /dev/null
+++ b/changes/bug24762
@@ -0,0 +1,3 @@
+  o Minor bugfixes (shutdown, file handling):
+    - Stop trying to remove NULL filenames on shutdown.
+      Fixes bug 24762; bugfix on master.

diff --git a/src/or/main.c b/src/or/main.c
index e449b95b916725644d3df2c2827e893229fd9aba..9e51e35bcb82631ba0b2e7e858d620e34048a990 100644 (file)
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -3480,12 +3480,12 @@ tor_free_all(int postfork)
 
 /**
  * Remove the specified file, and log a warning if the operation fails for
- * any reason other than the file not existing.
+ * any reason other than the file not existing. Ignores NULL filenames.
  */
 void
 tor_remove_file(const char *filename)
 {
-  if (tor_unlink(filename) != 0 && errno != ENOENT) {
+  if (filename && tor_unlink(filename) != 0 && errno != ENOENT) {
     log_warn(LD_FS, "Couldn't unlink %s: %s",
                filename, strerror(errno));
   }