[arch-commits] Commit in pidgin/trunk (2 files)

[Evangelos Foutras]

    Date: Friday, September 30, 2011 @ 12:26:42
  Author: foutrelis
Revision: 139166

upgpkg: pidgin 2.10.0-2

Fix remote crash in SILC plugin.

Added:
  pidgin/trunk/pidgin-2.10.0-silc-remote-crash-fix.diff
Modified:
  pidgin/trunk/PKGBUILD

------------------------------------------+
 PKGBUILD                                 |   14 ++++++++++----
 pidgin-2.10.0-silc-remote-crash-fix.diff |   21 +++++++++++++++++++++
 2 files changed, 31 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-09-30 15:29:38 UTC (rev 139165)
+++ PKGBUILD	2011-09-30 16:26:42 UTC (rev 139166)
@@ -7,7 +7,7 @@
 
 pkgname=('pidgin' 'libpurple' 'finch')
 pkgver=2.10.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://pidgin.im/"
 license=('GPL')
@@ -17,9 +17,11 @@
              'networkmanager')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
-        nm09-more.patch)
-md5sums=('e1453c9093c4f32beec19abd14069a3f'
-         'a673659d86c7a65aa710f7c8c7feda82')
+        nm09-more.patch
+        pidgin-2.10.0-silc-remote-crash-fix.diff)
+sha1sums=('859c6d9c9795c1adcf762b73e072e04a3a85a78d'
+          '0676b26f092fac3ee4bbea2261042b3f433c7751'
+          '8c7fc96abeca0f76d895bb33a530bf49e12f5bc6')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -28,6 +30,10 @@
   # http://developer.pidgin.im/ticket/13859
   patch -Np1 -i "$srcdir/nm09-more.patch"
 
+  # Fix remote crash in SILC plugin
+  # http://developer.pidgin.im/ticket/14636
+  patch -Np0 -i "$srcdir/pidgin-2.10.0-silc-remote-crash-fix.diff"
+
   # Use Python 2
   sed -i 's/env python$/&2/' */plugins/*.py \
     libpurple/purple-{remote,notifications-example,url-handler}

Added: pidgin-2.10.0-silc-remote-crash-fix.diff
===================================================================
--- pidgin-2.10.0-silc-remote-crash-fix.diff	                        (rev 0)
+++ pidgin-2.10.0-silc-remote-crash-fix.diff	2011-09-30 16:26:42 UTC (rev 139166)
@@ -0,0 +1,21 @@
+============================================================
+--- libpurple/protocols/silc/ops.c	30ab18780af11a53b6564a44c4e8ebfc1a296d78
++++ libpurple/protocols/silc/ops.c	80bd9a7d3faf9e5ef28438647159fe19847e9839
+@@ -408,9 +408,16 @@ silc_private_message(SilcClient client, 
+ 	}
+ 
+ 	if (flags & SILC_MESSAGE_FLAG_UTF8) {
+-		tmp = g_markup_escape_text((const char *)message, -1);
++		const char *msg = (const char *)message;
++		char *salvaged = NULL;
++		if (!g_utf8_validate((const char *)message, -1, NULL)) {
++			salvaged = purple_utf8_salvage((const char *)message);
++			msg = salvaged;
++		}
++		tmp = g_markup_escape_text(msg, -1);
+ 		/* Send to Purple */
+ 		serv_got_im(gc, sender->nickname, tmp, 0, time(NULL));
++		g_free(salvaged);
+ 		g_free(tmp);
+ 	}
+ }