From c5a0f56c9a60acfcebefdaa22ffb9e2139541cbc Mon Sep 17 00:00:00 2001 From: Niels Provos Date: Thu, 24 Sep 2009 22:21:09 +0000 Subject: [PATCH] from trunk: Do not drop data from evbuffer when out of memory; reported by Jacek Masiulaniec svn:r1437 --- ChangeLog | 1 + buffer.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index eb4006f1..f8484400 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Changes in 1.4.13-stable: o If the kernel tells us that there are a negative number of bytes to read from a socket, do not believe it. Fixes bug 2841177; found by Alexander Pronchenkov. o Do not allocate the maximum event queue and fd array for the epoll backend at startup. Instead, start out accepting 32 events at a time, and double the queue's size when it seems that the OS is generating events faster than we're requesting them. Saves up to 512K per epoll-based event_base. Resolves bug 2839240. o Fix compilation on Android, which forgot to define fd_mask in its sys/select.h + o Do not drop data from evbuffer when out of memory; reported by Jacek Masiulaniec Changes in 1.4.12-stable: diff --git a/buffer.c b/buffer.c index 6d1758d5..dfaca5d6 100644 --- a/buffer.c +++ b/buffer.c @@ -225,7 +225,6 @@ evbuffer_readline(struct evbuffer *buffer) if ((line = malloc(i + 1)) == NULL) { fprintf(stderr, "%s: out of memory\n", __func__); - evbuffer_drain(buffer, i); return (NULL); }