From: Alexander Barton <alex@barton.de>
Date: Sun, 23 Feb 2014 17:20:47 +0000 (+0100)
Subject: CHARCONV: Fix handling conversion errors
X-Git-Tag: rel-22-rc1~48
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=commitdiff_plain;h=abf280d5bd5648817135c487a19941b2ef4b0701

CHARCONV: Fix handling conversion errors

Don't overwrite already converted text!
---

diff --git a/src/ngircd/conn-encoding.c b/src/ngircd/conn-encoding.c
index 98cd29a3..d0c56306 100644
--- a/src/ngircd/conn-encoding.c
+++ b/src/ngircd/conn-encoding.c
@@ -125,7 +125,7 @@ Convert_Message(iconv_t Handle, char *Message)
 	if (iconv(Handle, &Message, &in_left, &out, &out_left) == (size_t)(-1)) {
 		/* An error occurred! */
 		LogDebug("Error converting message encoding!");
-		strlcpy(Encoding_Buffer, Message, sizeof(Encoding_Buffer));
+		strlcpy(out, Message, sizeof(Encoding_Buffer));
 		iconv(Handle, NULL, NULL, NULL, NULL);
 	} else
 		*out = '\0';