linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Razzloss (razzloss)
------------------------------------------------------------
revno: 358 [merge]
fixes bug(s): https://launchpad.net/bugs/541548
committer: Razzloss <razzloss@xxxxxxxxx>
branch nick: master
timestamp: Mon 2010-03-22 17:56:48 +0200
message:
  lp:541548 Drop 'junk' after \0 in chat messages
modified:
  Changelog.txt
  linux/hub.cc


--
lp:linuxdcpp
https://code.launchpad.net/~linuxdcpp-team/linuxdcpp/trunk

Your team LinuxDC++ Team is subscribed to branch lp:linuxdcpp.
To unsubscribe from this branch go to https://code.launchpad.net/~linuxdcpp-team/linuxdcpp/trunk/+edit-subscription.

=== modified file 'Changelog.txt'
--- Changelog.txt	2010-03-16 09:51:21 +0000
+++ Changelog.txt	2010-03-22 15:56:48 +0000
@@ -1,4 +1,4 @@
-*** 1.1.X 2009-XX-XX ***
+*** 1.1.X 201X-XX-XX ***
 [2009-02-22] Upgraded the DC++ core to 0.707, adding segmented downloading (thanks Razzloss).
 [2009-02-28] Upgraded the DC++ core to 0.7091.
 [2009-03-02] Fixed building with SCons 0.97.
@@ -47,6 +47,7 @@
 [2010-03-11] lp#361735: Improved magnet link support. Support for passing commands to running LinuxDC++ client. (Razzloss)
 [2010-03-15] lp#494392: Search by TTH should open in a new tab. (Razzloss)
 [2010-03-16] Added build and version information to terminal output. (Razzloss)
+[2010-03-22] lp#541548: Bad NMDC validation messes up LinuxDC++ chat formatting. (Razzloss)
 
 *** 1.0.3 2009-02-01 ***
 [2008-08-10] lp#256236: Fixed a crash on startup when using auto-open options.

=== modified file 'linux/hub.cc'
--- linux/hub.cc	2010-01-01 00:57:24 +0000
+++ linux/hub.cc	2010-03-22 15:47:40 +0000
@@ -375,6 +375,11 @@
 
 void Hub::addMessage_gui(string message)
 {
+	// See lp:541548, Some broken hubs end emotes with \0 instead of |. The core
+	// then passes the whole command from $ to next | to GUI and the null byte then
+	// messes the utf8 validation done by gtk_text_buffer_insert. So we drop everything
+	// after \0.
+	message = message.c_str();
 	if (message.empty())
 		return;