[tor-commits] [tor/master] fixup! Don't atoi off the end of a buffer chunk.

[nickm@xxxxxxxxxxxxxx]

commit 4c1ecd75830cbf43bc39b9c77ee01b3ce138e40c
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Feb 14 16:45:18 2017 -0500

    fixup! Don't atoi off the end of a buffer chunk.
    
    Use STATIC.
---
 src/or/buffers.c | 4 ++--
 src/or/buffers.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/or/buffers.c b/src/or/buffers.c
index 537a14a..015208f 100644
--- a/src/or/buffers.c
+++ b/src/or/buffers.c
@@ -1091,13 +1091,13 @@ buf_find_string_offset(const buf_t *buf, const char *s, size_t n)
 }
 
 /**
- * Scan the HTTP headers in the <b>headerlen</b>-byte string at
+ * Scan the HTTP headers in the <b>headerlen</b>-byte memory range at
  * <b>headers</b>, looking for a "Content-Length" header.  Try to set
  * *<b>result_out</b> to the numeric value of that header if possible.
  * Return -1 if the header was malformed, 0 if it was missing, and 1 if
  * it was present and well-formed.
  */
-/* STATIC */ int
+STATIC int
 buf_http_find_content_length(const char *headers, size_t headerlen,
                              size_t *result_out)
 {
diff --git a/src/or/buffers.h b/src/or/buffers.h
index 9762cf2..a9273dc 100644
--- a/src/or/buffers.h
+++ b/src/or/buffers.h
@@ -98,7 +98,7 @@ struct buf_t {
 #endif
 
 #ifdef BUFFERS_PRIVATE
-int buf_http_find_content_length(const char *headers, size_t headerlen,
+STATIC int buf_http_find_content_length(const char *headers, size_t headerlen,
                                         size_t *result_out);
 #endif
 



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