about summary refs log tree commit diff
diff options
context:
space:
mode:
authorLukas Fleischer <cgit@cryptocrack.de>2011-04-05 10:35:43 +0200
committerLars Hjemli <hjemli@gmail.com>2011-05-23 22:58:35 +0200
commita0bf375a1a9b74056a913f3687c6f5b42ad4acf6 (patch)
treed8845fbb7fcf73da11f29673081ed2ca31964e2e
parentFix memory leak in http_parse_querystring(). (diff)
downloadcgit-pink-a0bf375a1a9b74056a913f3687c6f5b42ad4acf6.tar.gz
cgit-pink-a0bf375a1a9b74056a913f3687c6f5b42ad4acf6.zip
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>
Diffstat (limited to '')
-rw-r--r--parsing.c5
1 files changed, 4 insertions, 1 deletions
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 */