GitHub/libevent
1
0
Fork 0
mirror of https://github.com/libevent/libevent.git synced 2025-01-31 09:12:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/pr/339'

Browse Source 
* origin/pr/339:
  evbuffer_add: Use last_with_datap if set, not last.
  test/regress: add tests for evbuffer_add() breakage on empty last chain

Fixes: #335
This commit is contained in:
Azat Khuzhin 2016-03-29 19:20:30 +03:00
commit b59ef3bd63
2 changed files with 92 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
buffer.c
View File

@ -1732,7 +1732,11 @@ evbuffer_add(struct evbuffer *buf, const void *data_in, size_t datlen)
goto done; goto done;
} }
chain = buf->last; if (*buf->last_with_datap == NULL) {
chain = buf->last;
} else {
chain = *buf->last_with_datap;
}
/* If there are no chains allocated for this buffer, allocate one /* If there are no chains allocated for this buffer, allocate one
* big enough to hold all the data. */ * big enough to hold all the data. */

87
test/regress_buffer.c
View File

@ -566,6 +566,60 @@ end:
evbuffer_free(buf); 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 int reference_cb_called;
static void static void
@ -622,6 +676,36 @@ test_evbuffer_reference(void *ptr)
evbuffer_free(src); 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 struct event_base *addfile_test_event_base = NULL;
static int addfile_test_done_writing = 0; static int addfile_test_done_writing = 0;
static int addfile_test_total_written = 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_many2", test_evbuffer_reserve_many, 0, &nil_setup, (void*)"add" },
{ "reserve_many3", test_evbuffer_reserve_many, 0, &nil_setup, (void*)"fill" }, { "reserve_many3", test_evbuffer_reserve_many, 0, &nil_setup, (void*)"fill" },
{ "expand", test_evbuffer_expand, 0, NULL, NULL }, { "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 }, { "reference", test_evbuffer_reference, 0, NULL, NULL },
{ "reference2", test_evbuffer_reference2, 0, NULL, NULL },
{ "iterative", test_evbuffer_iterative, 0, NULL, NULL }, { "iterative", test_evbuffer_iterative, 0, NULL, NULL },
{ "readln", test_evbuffer_readln, TT_NO_LOGS, &basic_setup, NULL }, { "readln", test_evbuffer_readln, TT_NO_LOGS, &basic_setup, NULL },
{ "search_eol", test_evbuffer_search_eol, 0, NULL, NULL }, { "search_eol", test_evbuffer_search_eol, 0, NULL, NULL },