rpms/dircproxy/FC-6 dircproxy-1.2.0-blank-me-segfault.patch, NONE, 1.1 dircproxy.spec, 1.2, 1.3

Warren Togami (wtogami) fedora-extras-commits at redhat.com
Thu Oct 4 21:56:01 UTC 2007


Author: wtogami

Update of /cvs/pkgs/rpms/dircproxy/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23847/FC-6

Modified Files:
	dircproxy.spec 
Added Files:
	dircproxy-1.2.0-blank-me-segfault.patch 
Log Message:
Fix segfault on blank /me


dircproxy-1.2.0-blank-me-segfault.patch:

--- NEW FILE dircproxy-1.2.0-blank-me-segfault.patch ---
diff -urN dircproxy-1.2.0-beta2.orig/src/irc_server.c dircproxy-1.2.0-beta2/src/irc_server.c
--- dircproxy-1.2.0-beta2.orig/src/irc_server.c	2006-10-07 17:07:08.000000000 -0400
+++ dircproxy-1.2.0-beta2/src/irc_server.c	2007-10-04 17:45:57.000000000 -0400
@@ -1155,7 +1155,7 @@
       
         if (!strcmp(cmsg.cmd, "ACTION")) {
           irclog_log(p, IRC_LOG_ACTION, logdest, msg.src.orig,
-                     "%s", cmsg.paramstarts[0]);
+                     "%s", (cmsg.paramstarts != NULL) ?  cmsg.paramstarts[0]: "none");
 
         } else if (!strcmp(cmsg.cmd, "DCC")
                    && p->conn_class->dcc_proxy_incoming) {


Index: dircproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dircproxy/FC-6/dircproxy.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dircproxy.spec	28 Oct 2006 05:43:48 -0000	1.2
+++ dircproxy.spec	4 Oct 2007 21:55:28 -0000	1.3
@@ -1,7 +1,7 @@
 Name:           dircproxy
 Version:        1.2.0
 %define betaver beta2
-Release:        0.5.%{betaver}%{?dist}
+Release:        0.6%{betaver}%{?dist}
 Summary:        IRC proxy server
 
 Group:          Applications/Internet
@@ -10,6 +10,7 @@
 Source0:        http://dircproxy.securiweb.net/pub/1.2/%{name}-%{version}-%{betaver}.tar.bz
 Source1:        dircproxy.init
 Source2:        dircproxy.sysconfig
+Patch0:         dircproxy-1.2.0-blank-me-segfault.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  openssl-devel
@@ -26,6 +27,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}-%{betaver}
+%patch0 -p1
 
 %build
 %configure --enable-ssl
@@ -77,6 +79,9 @@
 %{_datadir}/dircproxy/
 
 %changelog
+* Thu Oct 04 2007 Warren Togami <wtogami at redhat.com> - 1.2.0-0.6.beta2
+- Fix segfault on blank /me
+
 * Tue Oct 10 2006 Jarod Wilson <jwilson at redhat.com> - 1.2.0-0.5.beta2
 - Update to 1.2.0-beta2
 




More information about the fedora-extras-commits mailing list