From 67299796d92e05c7748133815dce26209706ac7b Mon Sep 17 00:00:00 2001 From: Holger Schemel Date: Mon, 2 Mar 2015 11:12:29 +0100 Subject: [PATCH] added null pointer checks to string functions --- src/libgame/misc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/libgame/misc.c b/src/libgame/misc.c index 259fb4de..5f9fb749 100644 --- a/src/libgame/misc.c +++ b/src/libgame/misc.c @@ -555,6 +555,9 @@ static char *getProgramMainDataPath() char *getStringCat2WithSeparator(char *s1, char *s2, char *sep) { + if (s1 == NULL || s2 == NULL || sep == NULL) + return NULL; + char *complete_string = checked_malloc(strlen(s1) + strlen(sep) + strlen(s2) + 1); @@ -565,6 +568,9 @@ char *getStringCat2WithSeparator(char *s1, char *s2, char *sep) char *getStringCat3WithSeparator(char *s1, char *s2, char *s3, char *sep) { + if (s1 == NULL || s2 == NULL || s3 == NULL || sep == NULL) + return NULL; + char *complete_string = checked_malloc(strlen(s1) + strlen(sep) + strlen(s2) + strlen(sep) + strlen(s3) + 1); -- 2.34.1