--- embedaddon/lighttpd/src/data_fastcgi.c	2013/10/14 10:32:47	1.1.1.1
+++ embedaddon/lighttpd/src/data_fastcgi.c	2016/11/02 10:35:00	1.1.1.2
@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "array.h"
 #include "fastcgi.h"
 
@@ -9,8 +11,8 @@ static data_unset *data_fastcgi_copy(const data_unset 
 	data_fastcgi *src = (data_fastcgi *)s;
 	data_fastcgi *ds = data_fastcgi_init();
 
-	buffer_copy_string_buffer(ds->key, src->key);
-	buffer_copy_string_buffer(ds->host, src->host);
+	buffer_copy_buffer(ds->key, src->key);
+	buffer_copy_buffer(ds->host, src->host);
 	ds->is_index_key = src->is_index_key;
 	return (data_unset *)ds;
 }
@@ -52,6 +54,7 @@ data_fastcgi *data_fastcgi_init(void) {
 	data_fastcgi *ds;
 
 	ds = calloc(1, sizeof(*ds));
+	force_assert(NULL != ds);
 
 	ds->key = buffer_init();
 	ds->host = buffer_init();