test/regress: add tests for evbuffer_add() breakage on empty last chain

The evbuffer/add* tests currenly break on 2.0.21, 2.0.22 and 2.1 HEAD
due to issue #335. The evbuffer/reference2 test breaks on 2.0.21 and
2.0.22 due to commit b18c04dd not being applied.

diff --git a/test/regress_buffer.c b/test/regress_buffer.c
index 957e59f1785af4648d9d51d3e8faea19f362aa06..c945599d30774c4c98fb7908b10ed7be6b5fe63e 100644 (file)
--- a/test/regress_buffer.c
+++ b/test/regress_buffer.c
@@ -566,6 +566,60 @@ end:
        evbuffer_free(buf);
 }
 
+static void
+test_evbuffer_add1(void *ptr)
+{
+       struct evbuffer *buf;
+       char *str;
+
+       buf = evbuffer_new();
+       evbuffer_add(buf, "1", 1);
+       evbuffer_validate(buf);
+       evbuffer_expand(buf, 2048);
+       evbuffer_validate(buf);
+       evbuffer_add(buf, "2", 1);
+       evbuffer_validate(buf);
+       evbuffer_add_printf(buf, "3");
+       evbuffer_validate(buf);
+
+       tt_assert(evbuffer_get_length(buf) == 3);
+       str = (char *)evbuffer_pullup(buf, -1);
+       tt_assert(str[0] == '1');
+       tt_assert(str[1] == '2');
+       tt_assert(str[2] == '3');
+end:
+       evbuffer_free(buf);
+}
+
+static void
+test_evbuffer_add2(void *ptr)
+{
+       struct evbuffer *buf;
+       static char data[4096];
+       int data_len = MIN_BUFFER_SIZE-EVBUFFER_CHAIN_SIZE-10;
+       char *str;
+       int len;
+
+       memset(data, 'P', sizeof(data));
+       buf = evbuffer_new();
+       evbuffer_add(buf, data, data_len);
+       evbuffer_validate(buf);
+       evbuffer_expand(buf, 100);
+       evbuffer_validate(buf);
+       evbuffer_add(buf, "2", 1);
+       evbuffer_validate(buf);
+       evbuffer_add_printf(buf, "3");
+       evbuffer_validate(buf);
+
+       len = evbuffer_get_length(buf);
+       tt_assert(len == data_len+2);
+       str = (char *)evbuffer_pullup(buf, -1);
+       tt_assert(str[len-3] == 'P');
+       tt_assert(str[len-2] == '2');
+       tt_assert(str[len-1] == '3');
+end:
+       evbuffer_free(buf);
+}
 
 static int reference_cb_called;
 static void
@@ -622,6 +676,36 @@ test_evbuffer_reference(void *ptr)
        evbuffer_free(src);
 }
 
+static void
+test_evbuffer_reference2(void *ptr)
+{
+       struct evbuffer *buf;
+       static char data[4096];
+       int data_len = MIN_BUFFER_SIZE-EVBUFFER_CHAIN_SIZE-10;
+       char *str;
+       int len;
+
+       memset(data, 'P', sizeof(data));
+       buf = evbuffer_new();
+       evbuffer_add(buf, data, data_len);
+       evbuffer_validate(buf);
+       evbuffer_expand(buf, 100);
+       evbuffer_validate(buf);
+       evbuffer_add_reference(buf, "2", 1, no_cleanup, NULL);
+       evbuffer_validate(buf);
+       evbuffer_add_printf(buf, "3");
+       evbuffer_validate(buf);
+
+       len = evbuffer_get_length(buf);
+       tt_assert(len == data_len+2);
+       str = (char *)evbuffer_pullup(buf, -1);
+       tt_assert(str[len-3] == 'P');
+       tt_assert(str[len-2] == '2');
+       tt_assert(str[len-1] == '3');
+end:
+       evbuffer_free(buf);
+}
+
 static struct event_base *addfile_test_event_base = NULL;
 static int addfile_test_done_writing = 0;
 static int addfile_test_total_written = 0;
@@ -2233,7 +2317,10 @@ struct testcase_t evbuffer_testcases[] = {
        { "reserve_many2", test_evbuffer_reserve_many, 0, &nil_setup, (void*)"add" },
        { "reserve_many3", test_evbuffer_reserve_many, 0, &nil_setup, (void*)"fill" },
        { "expand", test_evbuffer_expand, 0, NULL, NULL },
+       { "add1", test_evbuffer_add1, 0, NULL, NULL },
+       { "add2", test_evbuffer_add2, 0, NULL, NULL },
        { "reference", test_evbuffer_reference, 0, NULL, NULL },
+       { "reference2", test_evbuffer_reference2, 0, NULL, NULL },
        { "iterative", test_evbuffer_iterative, 0, NULL, NULL },
        { "readln", test_evbuffer_readln, TT_NO_LOGS, &basic_setup, NULL },
        { "search_eol", test_evbuffer_search_eol, 0, NULL, NULL },