repo: ngircd
action: commit
revision: 
path_from: 
revision_from: abf280d5bd5648817135c487a19941b2ef4b0701:
path_to: 
revision_to: 

commit abf280d5bd5648817135c487a19941b2ef4b0701
Author: Alexander Barton 
Date:   Sun Feb 23 18:20:47 2014 +0100

    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

--- 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';

-----END OF PAGE-----