rpms/epic/devel epic4-2.2-fuzzTest.patch, NONE, 1.1 epic.spec, 1.18, 1.19

[fedora-cvs-commits at redhat.com]

Author: pvrabec

Update of /cvs/dist/rpms/epic/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv939

Modified Files:
	epic.spec 
Added Files:
	epic4-2.2-fuzzTest.patch 
Log Message:
fix fuzz test fail (#181036)


epic4-2.2-fuzzTest.patch:
 numbers.c |    5 ++++-
 who.c     |   11 +++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

--- NEW FILE epic4-2.2-fuzzTest.patch ---
--- epic4-2.2/source/numbers.c.fuzzTest	2004-12-03 12:24:11.000000000 -0500
+++ epic4-2.2/source/numbers.c	2006-02-21 10:08:03.000000000 -0500
@@ -183,6 +183,10 @@
 	/* All numerics must have a target (our nickname) */
 	if (!comm || !*comm)
 		{ rfc1459_odd(from, comm, ArgList); return; }
+	numeric = atol(comm);
+  	if (numeric < 0 || numeric > 999)
+  		{ rfc1459_odd(from, comm, ArgList); return; }
+
 	if (!(target = ArgList[0]))
 		{ rfc1459_odd(from, comm, ArgList); return; }
 	ArgList++;
@@ -193,7 +197,6 @@
 	else
 		message_from(NULL, LOG_CRAP);
 
-	numeric = atol(comm);
 	current_numeric = -numeric;	/* must be negative of numeric! */
 
 	/*
--- epic4-2.2/source/who.c.fuzzTest	2006-02-21 10:17:14.000000000 -0500
+++ epic4-2.2/source/who.c	2006-02-21 10:25:29.000000000 -0500
@@ -635,6 +635,9 @@
 {
 	WhoEntry *new_w = who_queue_top(refnum);
 
+	if (!(ArgList[0]))
+  	                 { rfc1459_odd(from, comm, ArgList); return; }
+
 	if (!new_w)
 	{
 		new_w = get_new_who_entry();
@@ -663,6 +666,9 @@
 	WhoEntry 	*new_w = who_queue_top(refnum);
 	char 		buffer[1025];
 
+	if (!(ArgList[0]))
+  	                 { rfc1459_odd(from, comm, ArgList); return; }
+
 	PasteArgs(ArgList, 0);
 
 	if (who_whine)
@@ -913,6 +919,8 @@
 void	ison_returned (int refnum, const char *from, const char *comm, const char **ArgList)
 {
 	IsonEntry *new_i = ison_queue_top(refnum);
+	if (!(ArgList[0]))
+  	                 { rfc1459_odd(from, comm, ArgList); return; }
 
 	if (!new_i)
 	{
@@ -1166,6 +1174,9 @@
 	char *ptr;
 	char *results;
 
+	if (!(ArgList[0]))
+  	                 { rfc1459_odd(from, comm, ArgList); return; }
+
 	if (!top)
 	{
 		yell("### Please don't /quote a server command that returns the 302 numeric.");


Index: epic.spec
===================================================================
RCS file: /cvs/dist/rpms/epic/devel/epic.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- epic.spec	11 Feb 2006 02:38:32 -0000	1.18
+++ epic.spec	21 Feb 2006 09:53:34 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: An ircII chat client.
 Name: epic
 Version: 2.2
-Release: 2.2.1
+Release: 3
 Epoch: 4
 License: Distributable
 Group: Applications/Communications
@@ -15,6 +15,7 @@
 Source7: http://splitfire.sourceforge.net/schemes/sf-light-scheme.irc.gz
 Source8: http://splitfire.sourceforge.net/schemes/sf-perry-scheme.irc.gz
 Patch0: epic-default.patch
+Patch1: epic4-2.2-fuzzTest.patch
 URL: http://www.epicsol.org/
 Buildroot: /var/tmp/%{name}-%{version}-%{release}
 
@@ -27,7 +28,8 @@
 rm -rf $RPM_BUILD_DIR/ircii-EPIC%{prog_version}
 
 %setup -q -n epic4-%{version} -a 1
-%patch -p0 -b .default
+%patch0 -p0 -b .default
+%patch1 -p1 -b .fuzzTest
 
 %build
 %configure
@@ -78,6 +80,9 @@
 %{_datadir}/epic/help/*
 
 %changelog
+* Tue Feb 21 2006 Peter Vrabec <pvrabec at redhat.com> 4:2.2-3
+- fix fuzz test fail (#181036)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4:2.2-2.2.1
 - bump again for double-long bug on ppc(64)