From a0bf375a1a9b74056a913f3687c6f5b42ad4acf6 Mon Sep 17 00:00:00 2001
From: Lukas Fleischer <cgit@cryptocrack.de>
Date: Tue, 5 Apr 2011 10:35:43 +0200
Subject: [PATCH] Avoid null pointer dereference in reencode().

Returning "*txt" if "txt" is a null pointer is a bad thing. Spotted with
clang-analyzer.

Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
---
 parsing.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/parsing.c b/parsing.c
index c9e4350..151c0fe 100644
--- a/parsing.c
+++ b/parsing.c
@@ -103,7 +103,10 @@ const char *reencode(char **txt, const char *src_enc, const char *dst_enc)
 {
 	char *tmp;
 
-	if (!txt || !*txt || !src_enc || !dst_enc)
+	if (!txt)
+		return NULL;
+
+	if (!*txt || !src_enc || !dst_enc)
 		return *txt;
 
 	/* no encoding needed if src_enc equals dst_enc */
-- 
2.47.1