[tor-commits] [tor/master] Fix off-by-one error when allocating memory in test_util_split_lines()

nickm at torproject.org nickm at torproject.org
Thu Sep 1 02:12:47 UTC 2011


commit 76fde28475a5b977d1fa94d06c116ec39a386ac8
Author: Steven Murdoch <Steven.Murdoch at cl.cam.ac.uk>
Date:   Wed Aug 31 23:40:29 2011 +0100

    Fix off-by-one error when allocating memory in test_util_split_lines()
    
    Triggered "failed OVER picket-fence magic-number check (err 27)" when
    memory debugging using dmalloc is enabled (at 'low' or higher).
---
 src/test/test_util.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/test/test_util.c b/src/test/test_util.c
index 3b5d85f..b903cbf 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -1637,7 +1637,8 @@ test_util_split_lines(void *ptr)
 
   for (i=0; tests[i].orig_line; i++) {
     sl = smartlist_create();
-    orig_line = tor_malloc(tests[i].orig_length);
+    /* 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);
     tor_split_lines(sl, orig_line, tests[i].orig_length);
 





More information about the tor-commits mailing list