From 6f5225c7e0ad7a373af1decc212cde5c33b00730 Mon Sep 17 00:00:00 2001 From: Thejaswani Putta Date: Thu, 11 Apr 2019 18:36:08 -0700 Subject: Klocwork: Fix the Null pointer derefernce found by klocwork Signed-off-by: Thejaswani Putta Change-Id: I15973ac28e9645826986cf63d2160eedb83024e4 Reviewed-on: https://review.coreboot.org/c/coreboot/+/32290 Reviewed-by: Julius Werner Reviewed-by: Lijian Zhao Tested-by: build bot (Jenkins) --- src/lib/string.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/lib') diff --git a/src/lib/string.c b/src/lib/string.c index df2fd80849..2e71489ff6 100644 --- a/src/lib/string.c +++ b/src/lib/string.c @@ -6,7 +6,8 @@ char *strdup(const char *s) { size_t sz = strlen(s) + 1; char *d = malloc(sz); - memcpy(d, s, sz); + if (d) + memcpy(d, s, sz); return d; } @@ -15,7 +16,9 @@ char *strconcat(const char *s1, const char *s2) size_t sz_1 = strlen(s1); size_t sz_2 = strlen(s2); char *d = malloc(sz_1 + sz_2 + 1); - memcpy(d, s1, sz_1); - memcpy(d + sz_1, s2, sz_2 + 1); + if (d) { + memcpy(d, s1, sz_1); + memcpy(d + sz_1, s2, sz_2 + 1); + } return d; } -- cgit v1.2.3