From: juga0 <juga@riseup.net>
Date: Wed, 7 Nov 2018 12:04:09 +0000 (+0000)
Subject: bwauth: check if a bw file could be read
X-Git-Tag: tor-0.4.0.4-rc~26^2^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b75e2539f9994dc04ee7662445878e8486eb77b0;p=thirdparty%2Ftor.git

bwauth: check if a bw file could be read

Before serving it by HTTP.
---

diff --git a/src/feature/dircache/dircache.c b/src/feature/dircache/dircache.c
index 2aaaf7be11..d9625ee698 100644
--- a/src/feature/dircache/dircache.c
+++ b/src/feature/dircache/dircache.c
@@ -1453,13 +1453,15 @@ handle_get_next_bandwidth(dir_connection_t *conn,
     int lifetime = 60;
     char *bandwidth = read_file_to_str(options->V3BandwidthsFile,
                                        RFTS_IGNORE_MISSING, NULL);
-    size_t len = strlen(bandwidth);
-    write_http_response_header(conn, len, NO_METHOD, lifetime);
-    connection_buf_add(bandwidth, len, TO_CONN(conn));
-    tor_free(bandwidth);
-  } else {
-    write_short_http_response(conn, 404, "Not found");
+    if (bandwidth != NULL) {
+      site_t len = strlen(bandwidth);
+      write_http_response_header(conn, len, NO_METHOD, lifetime);
+      connection_buf_add(bandwidth, len, TO_CONN(conn));
+      tor_free(bandwidth);
+      return 0;
+    }
   }
+  write_short_http_response(conn, 404, "Not found");
   return 0;
 }