--- embedaddon/lighttpd/src/fdevent_poll.c	2013/10/14 10:32:48	1.1.1.1
+++ embedaddon/lighttpd/src/fdevent_poll.c	2016/11/02 10:35:00	1.1.1.2
@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "fdevent.h"
 #include "buffer.h"
 #include "log.h"
@@ -44,9 +46,11 @@ static int fdevent_poll_event_del(fdevents *ev, int fd
 		if (ev->unused.size == 0) {
 			ev->unused.size = 16;
 			ev->unused.ptr = malloc(sizeof(*(ev->unused.ptr)) * ev->unused.size);
+			force_assert(NULL != ev->unused.ptr);
 		} else if (ev->unused.size == ev->unused.used) {
 			ev->unused.size += 16;
 			ev->unused.ptr = realloc(ev->unused.ptr, sizeof(*(ev->unused.ptr)) * ev->unused.size);
+			force_assert(NULL != ev->unused.ptr);
 		}
 
 		ev->unused.ptr[ev->unused.used++] = k;
@@ -102,9 +106,11 @@ static int fdevent_poll_event_set(fdevents *ev, int fd
 		if (ev->size == 0) {
 			ev->size = 16;
 			ev->pollfds = malloc(sizeof(*ev->pollfds) * ev->size);
+			force_assert(NULL != ev->pollfds);
 		} else if (ev->size == ev->used) {
 			ev->size += 16;
 			ev->pollfds = realloc(ev->pollfds, sizeof(*ev->pollfds) * ev->size);
+			force_assert(NULL != ev->pollfds);
 		}
 
 		ev->pollfds[ev->used].fd = fd;
@@ -193,7 +199,7 @@ int fdevent_poll_init(fdevents *ev) {
 int fdevent_poll_init(fdevents *ev) {
 	UNUSED(ev);
 
-	log_error_write(srv, __FILE__, __LINE__,
+	log_error_write(ev->srv, __FILE__, __LINE__,
 		"s", "poll is not supported, try to set server.event-handler = \"select\"");
 
 	return -1;