Don't strdup(NULL)

merge_text() could call strdup(NULL) if one pointer was "" and the other
NULL. This commit fixes that.

Reported-by: fhuberts
Analyzed-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/dive.c b/dive.c
index 1b4c78306..da80044ed 100644
--- a/dive.c
+++ b/dive.c
@@ -908,11 +908,11 @@ static char *merge_text(const char *a, const char *b)
 	if (!a && !b)
 		return NULL;
 	if (!a || !*a)
-		return strdup(b);
+		return b ? strdup(b) : NULL;
 	if (!b || !*b)
 		return strdup(a);
 	if (!strcmp(a,b))
-		return strdup(a);
+		return a ? strdup(a) : NULL;
 	res = malloc(strlen(a) + strlen(b) + 32);
 	if (!res)
 		return (char *)a;