From 6281f580674813e58f083f63031c433393a30129 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Wed, 24 Feb 2021 15:28:40 +0100
Subject: Awesome indeed

---
 libc/inc/mem.h | 4 ++--
 libc/str.c     | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'libc')

diff --git a/libc/inc/mem.h b/libc/inc/mem.h
index 0498d8c..e4416dd 100644
--- a/libc/inc/mem.h
+++ b/libc/inc/mem.h
@@ -9,8 +9,8 @@ int malloc_allocated;
 
 void *malloc_debug(u32 size, const char *file, int line, const char *func, const char *inp);
 void free_debug(void *ptr, const char *file, int line, const char *func, const char *inp);
-#define malloc(size) malloc_debug(size, __FILE__, __LINE__, __func__, #size)
-#define free(ptr) free_debug(ptr, __FILE__, __LINE__, __func__, #ptr)
+#define malloc(size) malloc_debug((u32)(size), __FILE__, __LINE__, __func__, #size)
+#define free(ptr) free_debug((void *)(ptr), __FILE__, __LINE__, __func__, #ptr)
 void *realloc(void *ptr, u32 size);
 void *zalloc(u32 size);
 
diff --git a/libc/str.c b/libc/str.c
index 2e5f193..b8d4fb1 100644
--- a/libc/str.c
+++ b/libc/str.c
@@ -119,8 +119,7 @@ char *strdup(const char *s)
 	int l = strlen(s) + 1;
 	char *d = malloc(l);
 
-	if (d)
-		memcpy(d, s, l);
+	memcpy(d, s, l);
 
 	return d;
 }
-- 
cgit v1.2.3