packages: clamav/clamav.spec, clamav/clamav-segv.patch (NEW) - rel 2; avoid...

[arekm]

Author: arekm                        Date: Mon Nov 15 07:25:11 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2; avoid daemon segfault on some pdfs

---- Files affected:
packages/clamav:
   clamav.spec (1.287 -> 1.288) , clamav-segv.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/clamav/clamav.spec
diff -u packages/clamav/clamav.spec:1.287 packages/clamav/clamav.spec:1.288
--- packages/clamav/clamav.spec:1.287	Tue Oct 26 10:06:54 2010
+++ packages/clamav/clamav.spec	Mon Nov 15 08:25:06 2010
@@ -10,7 +10,7 @@
 Summary(pl.UTF-8):	Narzędzie antywirusowe dla Uniksów
 Name:		clamav
 Version:	0.96.4
-Release:	1
+Release:	2
 License:	GPL v2+
 Group:		Daemons
 Source0:	http://downloads.sourceforge.net/clamav/0.96rc1/%{name}-%{version}.tar.gz
@@ -26,6 +26,7 @@
 Patch1:		%{name}-nolibs.patch
 Patch2:		am-nosilentrules.patch
 Patch3:		%{name}-link.patch
+Patch4:		%{name}-segv.patch
 URL:		http://www.clamav.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -155,6 +156,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %{__libtoolize}
@@ -352,6 +354,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.288  2010/11/15 07:25:06  arekm
+- rel 2; avoid daemon segfault on some pdfs
+
 Revision 1.287  2010/10/26 08:06:54  lisu
 - CVE reference
 

================================================================
Index: packages/clamav/clamav-segv.patch
diff -u /dev/null packages/clamav/clamav-segv.patch:1.1
--- /dev/null	Mon Nov 15 08:25:11 2010
+++ packages/clamav/clamav-segv.patch	Mon Nov 15 08:25:06 2010
@@ -0,0 +1,13 @@
+--- clamav-0.96.4/libclamav/pdf.c~	2010-10-19 16:14:41.000000000 +0200
++++ clamav-0.96.4/libclamav/pdf.c	2010-11-15 08:23:09.826782407 +0100
+@@ -468,6 +468,10 @@
+ 		return 0;
+ 	    }
+ 	    q = pdf_nextobject(pdf->map+obj->start, pdf->size - obj->start);
++	    if (!q) {
++		cli_dbgmsg("cli_pdf: next object not found\n");
++		return 0;
++	    }
+ 	    length = atoi(q);
+ 	}
+     }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/clamav/clamav.spec?r1=1.287&r2=1.288&f=u