first round from ticket #661

2026-09-06 13:41:28 +00:00 · 2014-07-11 08:42:18 +02:00
parent fecb1af811
commit 540a3dbf33
1 changed files with 7 additions and 2 deletions
@@ -1768,8 +1768,13 @@ void *uwsgi_malloc(size_t size) {

 void *uwsgi_calloc(size_t size) {

-	char *ptr = uwsgi_malloc(size);
-	memset(ptr, 0, size);
+	char *ptr = calloc(1, size);
+	if (ptr == NULL) {
+		uwsgi_error("calloc()");
+		uwsgi_log("!!! tried memory allocation of %llu bytes !!!\n", (unsigned long long) size);
+		uwsgi_backtrace(uwsgi.backtrace_depth);
+		exit(1);
+	}
 	return ptr;
 }