[tor-commits] [tor/master] get rid of a case where we might log a NULL as %s

[nickm@xxxxxxxxxxxxxx]

commit dcd0aea85e9315c53a6b70a4a2b62ec65d539896
Author: Roger Dingledine <arma@xxxxxxxxxxxxxx>
Date:   Wed Sep 13 22:43:31 2017 -0400

    get rid of a case where we might log a NULL as %s
    
    this doesn't happen in our current code, and now it can't
---
 src/or/directory.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/or/directory.c b/src/or/directory.c
index 89e2735e6..9551b4155 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -3480,8 +3480,10 @@ write_http_status_line(dir_connection_t *conn, int status,
                        const char *reason_phrase)
 {
   char buf[256];
+  if (!reason_phrase)
+    reason_phrase = "unspecified";
   if (tor_snprintf(buf, sizeof(buf), "HTTP/1.0 %d %s\r\n\r\n",
-      status, reason_phrase ? reason_phrase : "OK") < 0) {
+      status, reason_phrase) < 0) {
     log_warn(LD_BUG,"status line too long.");
     return;
   }



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits