rpms/wv/FC-4 wv-1.0.3-CVE-2006-4513.patch, 1.1, 1.2 wv.spec, 1.12, 1.13

[Aurelien Bompard (abompard)]

Author: abompard

Update of /cvs/extras/rpms/wv/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24586

Modified Files:
	wv-1.0.3-CVE-2006-4513.patch wv.spec 
Log Message:
fix CVE-2006-4513 properly

wv-1.0.3-CVE-2006-4513.patch:

Index: wv-1.0.3-CVE-2006-4513.patch
===================================================================
RCS file: /cvs/extras/rpms/wv/FC-4/wv-1.0.3-CVE-2006-4513.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wv-1.0.3-CVE-2006-4513.patch	29 Oct 2006 18:00:59 -0000	1.1
+++ wv-1.0.3-CVE-2006-4513.patch	29 Oct 2006 18:46:19 -0000	1.2
@@ -1,6 +1,5 @@
-diff -bruN wv-1.2.2/lfo.c wv-1.2.3/lfo.c
---- wv-1.2.2/lfo.c	2005-04-17 23:16:58.000000000 +0200
-+++ wv-1.2.3/lfo.c	2006-10-20 03:48:47.000000000 +0200
+--- lfo.c	2005-04-17 23:16:58.000000000 +0200
++++ lfo.c	2006-10-20 03:48:47.000000000 +0200
 @@ -32,6 +32,16 @@
  followed by its corresponding LVL structure (if LFOLVL.fFormatting is set).
  */
@@ -56,3 +55,26 @@
      return (0);
  }
  
+--- wvConfig.c  18 Apr 2005 21:14:48 -0000      1.70
++++ wvConfig.c  25 Oct 2006 11:55:04 -0000      1.71
+@@ -3682,7 +3682,8 @@
+ void
+ wvBeginDocument (expand_data * data)
+ {
+-    if ((data->sd != NULL) && (data->sd->elements[TT_DOCUMENT].str[0] != NULL))
++    if ((data->sd) && (data->sd->elements[TT_DOCUMENT].str)
++       && (data->sd->elements[TT_DOCUMENT].str[0] != NULL))
+       {
+          wvTrace (("doc begin is %s", data->sd->elements[TT_DOCUMENT].str[0]));
+          wvExpand (data, data->sd->elements[TT_DOCUMENT].str[0],
+@@ -3708,7 +3709,8 @@
+     data->props = (void *) &apap;
+     wvEndPara (data);
+ 
+-    if ((data->sd != NULL) && (data->sd->elements[TT_DOCUMENT].str[1] != NULL))
++    if ((data->sd) && (data->sd->elements[TT_DOCUMENT].str)
++       && (data->sd->elements[TT_DOCUMENT].str[1] != NULL))
+       {
+          wvExpand (data, data->sd->elements[TT_DOCUMENT].str[1],
+                    strlen (data->sd->elements[TT_DOCUMENT].str[1]));
+


Index: wv.spec
===================================================================
RCS file: /cvs/extras/rpms/wv/FC-4/wv.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- wv.spec	29 Oct 2006 18:00:59 -0000	1.12
+++ wv.spec	29 Oct 2006 18:46:19 -0000	1.13
@@ -1,7 +1,7 @@
 Name:       wv
 Summary:    MSWord 6/7/8/9 binary file format to HTML converter
 Version:    1.0.3
-Release:    2%{?dist}
+Release:    3%{?dist}
 License:    GPL
 Group:      Applications/Text
 URL:        http://wvware.sourceforge.net
@@ -35,7 +35,7 @@
 %patch1 -p1 -b .oledecod
 %patch2 -p1 -b .gcc4
 %patch5 -p1 -b .printf-rhbug150461
-%patch6 -p1 -b .CVE-2006-4513
+%patch6 -p0 -b .CVE-2006-4513
 
 
 %build
@@ -72,6 +72,9 @@
 
 %changelog
 * Sun Oct 29 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.0.3-2
+- fix CVE-2006-4513 properly (see bug 212698)
+
+* Sun Oct 29 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.0.3-2
 - fix CVE-2006-4513
 
 * Sun May 15 2005 Aurelien Bompard <gauret[AT]free.fr> 1.0.3-1%{?dist}