[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#868337: jessie-pu: package hexchat/2.10.1-1+deb8u1



Package: release.debian.org
Severity: normal
Tags: jessie
User: release.debian.org@packages.debian.org
Usertags: pu

I'd like to fix https://bugs.debian.org/779892 also in jessie.
It's a somewhat hard to trig segfault, caused by a debian-only patch
missing braces.

https://sources.debian.net/src/hexchat/2.10.1-1%2Bdeb8u1/debian/patches/debian_defaults.patch/
You can see here how the patch adds a second statement that it is meant
to be within the `if`, but that if is without braces, so havoc befalls.

Proposed patch, tested on jessie, attached.

-- 
regards,
                        Mattia Rizzolo

GPG Key: 66AE 2B4A FCCF 3F52 DA18  4D18 4B04 3FCD B944 4540      .''`.
more about me:  https://mapreri.org                             : :'  :
Launchpad user: https://launchpad.net/~mapreri                  `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia  `-
diffstat for hexchat-2.10.1 hexchat-2.10.1

 changelog                     |    7 +++++++
 patches/debian_defaults.patch |   10 +++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff -Nru hexchat-2.10.1/debian/changelog hexchat-2.10.1/debian/changelog
--- hexchat-2.10.1/debian/changelog	2016-05-05 00:18:47.000000000 +0200
+++ hexchat-2.10.1/debian/changelog	2017-07-14 17:14:05.000000000 +0200
@@ -1,3 +1,10 @@
+hexchat (2.10.1-1+deb8u2) jessie; urgency=medium
+
+  * Fix segfault on /server, by adding missing braces around an `if`.
+    (Closes: #779892)
+
+ -- Mattia Rizzolo <mattia@debian.org>  Fri, 14 Jul 2017 17:14:05 +0200
+
 hexchat (2.10.1-1+deb8u1) jessie; urgency=medium
 
   * Security Update: verify hostnames when ssl is in use     
diff -Nru hexchat-2.10.1/debian/patches/debian_defaults.patch hexchat-2.10.1/debian/patches/debian_defaults.patch
--- hexchat-2.10.1/debian/patches/debian_defaults.patch	2014-08-23 20:49:00.000000000 +0200
+++ hexchat-2.10.1/debian/patches/debian_defaults.patch	2017-07-14 17:13:26.000000000 +0200
@@ -14,12 +14,13 @@
  
  	while (1)
  	{
---- hexchat-2.10.1.orig/src/fe-gtk/joind.c
-+++ hexchat-2.10.1/src/fe-gtk/joind.c
-@@ -247,9 +247,14 @@ joind_show_dialog (server *serv)
+--- a/src/fe-gtk/joind.c
++++ b/src/fe-gtk/joind.c
+@@ -247,11 +247,18 @@
  							G_CALLBACK (joind_ok_cb), serv);
  							
  	if (serv->network)
++	{
 +		if (g_ascii_strcasecmp(((ircnet*)serv->network)->name, "OFTC") == 0)
 +		{
 +			gtk_entry_set_text (GTK_ENTRY (entry1), "#debian");
@@ -31,4 +32,7 @@
 +			gtk_entry_set_text (GTK_ENTRY (entry1), "#debian");
  			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(radiobutton2), TRUE);
  		}
++	}
  
+ 	gtk_widget_grab_focus (okbutton1);
+ 	gtk_widget_show_all (dialog1);

Attachment: signature.asc
Description: PGP signature


Reply to: