commit 9f403cf212ad3964687efe836fa135e45b828e2e
author maximilian attems <max@stro.at> Fri Jun 10 16:25:51 2011 +0200
committer maximilian attems <max@stro.at> Tue Jun 14 17:11:17 2011 +0200
tree 56c2156fe98cfe078e2e19ae2e6b368a845e05bf
parent d16b1b15a14bfeac86125b250aa72831d2081f00

[klibc] strndup(): Fix possible null pointer dereference

Directly return NULL if malloc failed.

Reviewed-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: maximilian attems <max@stro.at>

usr/klibc/strndup.c

diff --git a/usr/klibc/strndup.c b/usr/klibc/strndup.c
index 8b5974a..65afd44 100644
--- a/usr/klibc/strndup.c
+++ b/usr/klibc/strndup.c
@@ -10,8 +10,10 @@
 	int l = n > strlen(s) ? strlen(s) + 1 : n + 1;
 	char *d = malloc(l);
 
-	if (d)
-		memcpy(d, s, l);
+	if (!d)
+		return NULL;
+
+	memcpy(d, s, l);
 	d[n] = '\0';
 	return d;
 }