Tweaks on last process-launch patches

diff --git a/src/common/util.c b/src/common/util.c
index 30c298e0dc75c30e2ed2b90d8917cbde1cb94aae..7cd9dd8e0e0afb95d16757ece1e620ef3ea86f14 100644 (file)
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -3616,6 +3616,7 @@ tor_read_all_handle(FILE *h, char *buf, size_t count,
       }
     }
     tor_assert(retval != NULL);
+    tor_assert(strlen(retval) + numread <= count);
     numread += strlen(retval);
   }
 

diff --git a/src/test/test_util.c b/src/test/test_util.c
index 336f95b14f98da5449e7b7cc3e7a374fdbb4913a..06c1be3e3af16aae456c00d0dae3e2500969a57f 100644 (file)
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -1647,8 +1647,7 @@ test_util_split_lines(void *ptr)
   for (i=0; tests[i].orig_line; i++) {
     sl = smartlist_create();
     /* Allocate space for string and trailing NULL */
-    orig_line = tor_malloc(tests[i].orig_length + 1);
-    memcpy(orig_line, tests[i].orig_line, tests[i].orig_length + 1);
+    orig_line = tor_memdup(tests[i].orig_line, tests[i].orig_length + 1);
     tor_split_lines(sl, orig_line, tests[i].orig_length);
 
     j = 0;