[bitlbee] Add upstream patch to avoid double-free crash (#922447)

[Matej Cepl]

commit dd77fa0e6b60fe57434449cb45693a211830e0e5
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Tue Apr 2 13:18:57 2013 +0200

    Add upstream patch to avoid double-free crash (#922447)

 bitlbee.spec               |   10 +++++++++-
 nss-crash-rhbz922447.patch |   20 ++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletions(-)
---
diff --git a/bitlbee.spec b/bitlbee.spec
index 0888e45..5855eb6 100644
--- a/bitlbee.spec
+++ b/bitlbee.spec
@@ -13,7 +13,7 @@
 Summary:           IRC to other chat networks gateway
 Name:              bitlbee
 Version:           3.2
-Release:           2%{?dist}
+Release:           3%{?dist}
 License:           GPLv2+ and MIT
 Group:             System Environment/Daemons
 URL:               http://www.bitlbee.org/
@@ -32,6 +32,9 @@ Patch3:            bitlbee-forkdaemon.patch
 # Patch rejected upstream, however we need to keep this, because
 # of the SELinux policy is set up for this mode of operation.
 Patch4:            bitlbee-systemd.patch
+# Suggested fix for https://bugzilla.redhat.com/922447 aka
+# http://bugs.bitlbee.org/bitlbee/ticket/1038
+Patch5:            nss-crash-rhbz922447.patch
 
 Requires(pre):     shadow-utils
 Requires(preun):   /sbin/service
@@ -94,6 +97,8 @@ echo With systemd %with_systemd
 %patch4 -p1
 %endif
 
+%patch5 -p1
+
 %build
 # Note that we cannot use openssl in Fedora packages ... it breaks GPL
 CFLAGS="$RPM_OPT_FLAGS" ./configure \
@@ -225,6 +230,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Apr 02 2013 Matěj Cepl <mcepl at redhat.com> - 3.2-3
+- Add upstream patch to avoid double-free crash (#922447)
+
 * Thu Mar 14 2013 Robert Scheck <robert at fedoraproject.org> 3.2-2
 - Add accidentially lost OTR support for RHEL 5 and 6 (#919912)
 
diff --git a/nss-crash-rhbz922447.patch b/nss-crash-rhbz922447.patch
new file mode 100644
index 0000000..dcaeae3
--- /dev/null
+++ b/nss-crash-rhbz922447.patch
@@ -0,0 +1,20 @@
+--- a/lib/ssl_nss.c
++++ b/lib/ssl_nss.c
+@@ -151,7 +151,7 @@ void *ssl_starttls(int fd, char *hostnam
+ 	conn->fd = fd;
+ 	conn->func = func;
+ 	conn->data = data;
+-	conn->hostname = hostname;
++	conn->hostname = g_strdup(hostname);
+ 
+ 	/* For now, SSL verification is globally enabled by setting the cafile
+ 	   setting in bitlbee.conf. Commented out by default because probably
+@@ -295,7 +295,7 @@ void ssl_disconnect(void *conn_)
+ 	if (conn->prfd)
+ 		PR_Close(conn->prfd);
+ 
+-        g_free(conn->hostname);
++	g_free(conn->hostname);
+ 	g_free(conn);
+ }
+