cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-24 03:40:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix evbuffer_find off by one; found by Ken Cox; regression test by him

Browse Source 
and fix by me


svn:r353
This commit is contained in:
Niels Provos 2007-04-19 03:13:12 +00:00
parent f5aa65c9b3
commit 4408a5f8fc
3 changed files with 65 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
buffer.c
View File

@ -431,13 +431,12 @@ evbuffer_write(struct evbuffer *buffer, int fd)
u_char * u_char *
evbuffer_find(struct evbuffer *buffer, const u_char *what, size_t len) evbuffer_find(struct evbuffer *buffer, const u_char *what, size_t len)
{ {
size_t remain = buffer->off; u_char *search = buffer->buffer, *end = search + buffer->off;
u_char *search = buffer->buffer;
u_char *p; u_char *p;
while ((p = memchr(search, *what, remain)) != NULL) { while (search < end &&
remain = buffer->off - (size_t)(search - buffer->buffer); (p = memchr(search, *what, end - search)) != NULL) {
if (remain < len) if (p + len > end)
break; break;
if (memcmp(p, what, len) == 0) if (memcmp(p, what, len) == 0)
return (p); return (p);

2
configure.in
View File

@ -2,7 +2,7 @@ dnl configure.in for libevent
dnl Dug Song <dugsong@monkey.org> dnl Dug Song <dugsong@monkey.org>
AC_INIT(event.c) AC_INIT(event.c)
AM_INIT_AUTOMAKE(libevent,1.3a) AM_INIT_AUTOMAKE(libevent,1.3b)
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE AM_MAINTAINER_MODE

64
test/regress.c
View File

@ -604,6 +604,61 @@ test_evbuffer(void) {
cleanup_test(); cleanup_test();
} }
void
test_evbuffer_find(void)
{
u_char* p;
char* test1 = "1234567890\r\n";
char* test2 = "1234567890\r";
#define EVBUFFER_INITIAL_LENGTH 256
char test3[EVBUFFER_INITIAL_LENGTH];
unsigned int i;
struct evbuffer * buf = evbuffer_new();
/* make sure evbuffer_find doesn't match past the end of the buffer */
fprintf(stdout, "Testing evbuffer_find 1: ");
evbuffer_add(buf, (u_char*)test1, strlen(test1));
evbuffer_drain(buf, strlen(test1));
evbuffer_add(buf, (u_char*)test2, strlen(test2));
p = evbuffer_find(buf, (u_char*)"\r\n", 2);
if (p == NULL) {
fprintf(stdout, "OK\n");
} else {
fprintf(stdout, "FAILED\n");
exit(1);
}
/*
* drain the buffer and do another find; in r309 this would
* read past the allocated buffer causing a valgrind error.
*/
fprintf(stdout, "Testing evbuffer_find 2: ");
evbuffer_drain(buf, strlen(test2));
for (i = 0; i < EVBUFFER_INITIAL_LENGTH; ++i)
test3[i] = 'a';
test3[EVBUFFER_INITIAL_LENGTH - 1] = 'x';
evbuffer_add(buf, (u_char *)test3, EVBUFFER_INITIAL_LENGTH);
p = evbuffer_find(buf, (u_char *)"xy", 2);
if (p == NULL) {
printf("OK\n");
} else {
fprintf(stdout, "FAILED\n");
exit(1);
}
/* simple test for match at end of allocated buffer */
fprintf(stdout, "Testing evbuffer_find 3: ");
p = evbuffer_find(buf, (u_char *)"ax", 2);
if (p != NULL && strncmp(p, "ax", 2) == 0) {
printf("OK\n");
} else {
fprintf(stdout, "FAILED\n");
exit(1);
}
evbuffer_free(buf);
}
void void
readcb(struct bufferevent *bev, void *arg) readcb(struct bufferevent *bev, void *arg)
{ {
@ -988,6 +1043,11 @@ main (int argc, char **argv)
/* Initalize the event library */ /* Initalize the event library */
event_base = event_init(); event_base = event_init();
test_evbuffer();
test_evbuffer_find();
test_bufferevent();
http_suite(); http_suite();
rpc_suite(); rpc_suite();
@ -1011,10 +1071,6 @@ main (int argc, char **argv)
#endif #endif
test_loopexit(); test_loopexit();
test_evbuffer();
test_bufferevent();
test_priorities(1); test_priorities(1);
test_priorities(2); test_priorities(2);
test_priorities(3); test_priorities(3);