[tor-commits] [tor/master] Ensure that line_size >= 1 before trying to trim input string.

[nickm@xxxxxxxxxxxxxx]

commit c8b8b15f0eb2651dea694a057e70e6b8c34dbe05
Author: Alexander Færøy <ahf@xxxxxxxxxxxxxx>
Date:   Fri Dec 14 03:31:56 2018 +0100

    Ensure that line_size >= 1 before trying to trim input string.
    
    See: https://bugs.torproject.org/28179
---
 src/lib/process/process.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/process/process.c b/src/lib/process/process.c
index fb76a0a72..b3370e919 100644
--- a/src/lib/process/process.c
+++ b/src/lib/process/process.c
@@ -766,13 +766,13 @@ process_read_lines(process_t *process,
     tor_assert(ret != -1);
 
     /* Remove \n from the end of the line. */
-    if (data[line_size - 1] == '\n') {
+    if (line_size >= 1 && data[line_size - 1] == '\n') {
       data[line_size - 1] = '\0';
       --line_size;
     }
 
     /* Remove \r from the end of the line. */
-    if (data[line_size - 1] == '\r') {
+    if (line_size >= 1 && data[line_size - 1] == '\r') {
       data[line_size - 1] = '\0';
       --line_size;
     }



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