rpms/clamav/FC-3 clamav-0.88.1-strncpy.patch,1.1,1.2

[Enrico Scholz (ensc)]

Author: ensc

Update of /cvs/extras/rpms/clamav/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31449/FC-3

Modified Files:
	clamav-0.88.1-strncpy.patch 
Log Message:
fixed broken patches


clamav-0.88.1-strncpy.patch:

Index: clamav-0.88.1-strncpy.patch
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-3/clamav-0.88.1-strncpy.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- clamav-0.88.1-strncpy.patch	30 Apr 2006 10:33:39 -0000	1.1
+++ clamav-0.88.1-strncpy.patch	1 May 2006 11:17:41 -0000	1.2
@@ -24,29 +24,3 @@
  
    while((chptr = strchr(S1, '\\')) != NULL) /* ignore backslash             */
    {
-2006-04-24  Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
-
-	* libclamav/unrarlib.c/stricomp(): terminate the string copied
-	  with strncpy() explicitly with '\0'. Does not seem to be
-	  exploitable at the moment due to deeply buried constraints
-	  (function will be called for buffers with a static size of
-	  260 only).
-
-	  But it is better to fix it now than to run into problems
-	  when function is used for other purposes.
-
---- clamav-0.88.1/libclamav/unrarlib.c.strncpy	2005-06-23 22:03:12.000000000 +0200
-+++ clamav-0.88.1/libclamav/unrarlib.c	2006-04-24 23:10:07.000000000 +0200
-@@ -1180,8 +1180,10 @@ int stricomp(char *Str1,char *Str2)
-   char S1[512],S2[512];
-   char *chptr;
- 
--  strncpy(S1,Str1,sizeof(S1));
--  strncpy(S2,Str2,sizeof(S2));
-+  strncpy(S1,Str1,sizeof(S1));
-+  strncpy(S2,Str2,sizeof(S2));
-+  S1[sizeof(S1)-1] = '\0';
-+  S2[sizeof(S2)-1] = '\0';
- 
-   while((chptr = strchr(S1, '\\')) != NULL) /* ignore backslash             */
-   {