Commit 771fb7e7 authored by Roger Dingledine's avatar Roger Dingledine
Browse files

get rid of the scary 256-byte-buf landmine

parent eb429232

src/or/directory.c

+6 −8
Original line number Diff line number Diff line
@@ -3479,7 +3479,7 @@ static void 
write_http_status_line(dir_connection_t *conn, int status,

                       const char *reason_phrase)

{

  char buf[256+RFC1123_TIME_LEN+1];

  char *buf = NULL;

  char *datestring = NULL;



  if (!reason_phrase) { /* bullet-proofing */
@@ -3493,16 +3493,14 @@ write_http_status_line(dir_connection_t *conn, int status, 
    tor_asprintf(&datestring, "Date: %s\r\n", datebuf);

  }



  if (tor_snprintf(buf, sizeof(buf), "HTTP/1.0 %d %s\r\n%s\r\n",

      status, reason_phrase, datestring?datestring:"") < 0) {

    log_warn(LD_BUG,"status line too long.");

    tor_free(datestring);

    return;

  }

  tor_free(datestring);

  tor_asprintf(&buf, "HTTP/1.0 %d %s\r\n%s\r\n",

               status, reason_phrase, datestring?datestring:"");



  log_debug(LD_DIRSERV,"Wrote status 'HTTP/1.0 %d %s'", status, reason_phrase);

  connection_buf_add(buf, strlen(buf), TO_CONN(conn));



  tor_free(datestring);

  tor_free(buf);

}



/** Write the header for an HTTP/1.0 response onto <b>conn</b>-\>outbuf,