X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fngircd%2Fconn-encoding.c;h=b827d02ae4d4abe78f67007be5411bd2f218e1f4;hb=43fb18f2f5a506c4d78967e4b6e961b7339c98dc;hp=71ab58848a5aa87d258f85156ab98021d5c0cd7a;hpb=46b0eef721b9b3eec37d29aff65b6a7fc488a887;p=ngircd-alex.git

diff --git a/src/ngircd/conn-encoding.c b/src/ngircd/conn-encoding.c
index 71ab5884..b827d02a 100644
--- a/src/ngircd/conn-encoding.c
+++ b/src/ngircd/conn-encoding.c
@@ -38,7 +38,6 @@ char Encoding_Buffer[COMMAND_LEN];
 
 char *Convert_Message PARAMS((iconv_t Handle, char *Message));
 
-
 /**
  * Set client character encoding on a connection.
  *
@@ -123,9 +122,9 @@ Convert_Message(iconv_t Handle, char *Message)
 	out_left = sizeof(Encoding_Buffer) - 1;
 
 	if (iconv(Handle, &Message, &in_left, &out, &out_left) == (size_t)(-1)) {
-		/* An error occured! */
+		/* 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';
@@ -133,7 +132,7 @@ Convert_Message(iconv_t Handle, char *Message)
 	return Encoding_Buffer;
 }
 
-#endif
+#endif /* ICONV */
 
 /**
  * Convert encoding of a message received from a connection.