From 2f13288a23da4dfaf6c40e1e943f83d8fa43145a Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Thu, 14 Jul 2016 11:45:11 +0200
Subject: Fix sme warnings...

---
 src/kernel/core/kmalloc.c | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'src/kernel/core/kmalloc.c')

diff --git a/src/kernel/core/kmalloc.c b/src/kernel/core/kmalloc.c
index 95347b3..985df41 100644
--- a/src/kernel/core/kmalloc.c
+++ b/src/kernel/core/kmalloc.c
@@ -2,6 +2,7 @@
 
 #include <slab_alloc.h>
 #include <mutex.h>
+#include <string.h>
 
 #include <frame.h>
 #include <paging.h>
@@ -77,6 +78,8 @@ void* malloc0(size_t sz) {
 }
 
 void* malloc(size_t sz) {
+	if (sz == 0) return 0;
+
 	void* res;
 	int tries = 0;
 
@@ -88,6 +91,12 @@ void* malloc(size_t sz) {
 	return res;
 }
 
+void* calloc(size_t nmemb, size_t sz) {
+	void* r = malloc(nmemb * sz);
+	if (r != 0) memset(r, 0, nmemb * sz);
+	return r;
+}
+
 void free(void* ptr) {
 	mutex_lock(&malloc_mutex);
 	slab_free(kernel_allocator, ptr);
-- 
cgit v1.2.3