Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

1 files changed, 12 insertions, 0 deletions

diff --git a/src/test/test.c b/src/test/test.c
index c12ba93d79..0e48533978 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -813,6 +813,18 @@ test_buffers(void)
   buf_free(buf);
   buf = NULL;
 
+  /* Try adding a string too long for any freelist. */
+  {
+    char *cp = tor_malloc_zero(65536);
+    buf = buf_new();
+    write_to_buf(cp, 65536, buf);
+    tor_free(cp);
+
+    tt_int_op(buf_datalen(buf), ==, 65536);
+    buf_free(buf);
+    buf = NULL;
+  }
+
  done:
   if (buf)
     buf_free(buf);