Author: Lukas Fleischer <cgit@cryptocrack.de>
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 ++++-
diff --git a/parsing.c b/parsing.c index c9e43509242d1d3a4e6faf85da7ce46375659ab3..151c0fe468c64174ae260ba9b5ddd2d8de52e81e 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 */