diff options
author | Lars Hjemli | 2011-05-23 23:26:10 +0200 |
---|---|---|
committer | Lars Hjemli | 2011-05-23 23:26:10 +0200 |
commit | 652a5a18db3b0409fedfaf8c5720446d87628ba0 (patch) | |
tree | cefa386058d968217af24374b93972820a9b43a8 /parsing.c | |
parent | 4837fddc35bbd8d6f66a40486f75cdee3197172d (diff) | |
parent | ec79265f2053e6dc20e0ec486719f5954d2be83d (diff) | |
download | cgit-652a5a18db3b0409fedfaf8c5720446d87628ba0.tar.gz |
Merge branch 'stable'
Diffstat (limited to '')
-rw-r--r-- | parsing.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -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 */ |