rpms/htmldoc/devel htmldoc-1.8.27-fortify-fail.patch, NONE, 1.1 htmldoc.spec, 1.16, 1.17

[Adam Goode]

Author: agoode

Update of /cvs/extras/rpms/htmldoc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17633

Modified Files:
	htmldoc.spec 
Added Files:
	htmldoc-1.8.27-fortify-fail.patch 
Log Message:
* Thu Aug 13 2009 Adam Goode <adam at spicenitz.org> - 1.8.27-12
- Fix limitation of -D_FORTIFY_SOURCE=2 (#511520)
- Fix scanf overflows (#512513)


htmldoc-1.8.27-fortify-fail.patch:
 ps-pdf.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE htmldoc-1.8.27-fortify-fail.patch ---
diff -ur htmldoc-1.8.27~/htmldoc/ps-pdf.cxx htmldoc-1.8.27/htmldoc/ps-pdf.cxx
--- htmldoc-1.8.27~/htmldoc/ps-pdf.cxx	2009-08-13 19:32:21.846860508 -0400
+++ htmldoc-1.8.27/htmldoc/ps-pdf.cxx	2009-08-13 19:40:29.185857503 -0400
@@ -8619,7 +8619,7 @@
           return (NULL);
         }
 	// Safe because buffer is allocated...
-        strcpy((char *)r->data.text.buffer, (char *)data);
+        memcpy((char *)r->data.text.buffer, (char *)data, strlen((char *)data));
         get_color(_htmlTextColor, r->data.text.rgb);
         break;
     case RENDER_IMAGE :
@@ -8640,7 +8640,7 @@
           return (NULL);
         }
 	// Safe because buffer is allocated...
-        strcpy((char *)r->data.link, (char *)data);
+        memcpy((char *)r->data.link, (char *)data, strlen((char *)data));
         break;
   }
 


Index: htmldoc.spec
===================================================================
RCS file: /cvs/extras/rpms/htmldoc/devel/htmldoc.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- htmldoc.spec	13 Aug 2009 23:31:18 -0000	1.16
+++ htmldoc.spec	13 Aug 2009 23:46:02 -0000	1.17
@@ -16,6 +16,7 @@ Patch0:		htmldoc-1.8.27-desktop-icon.pat
 Patch1:		htmldoc-1.8.27-dingbats-standard.patch
 Patch2:		htmldoc-1.8.27-system-fonts.patch
 Patch3:		htmldoc-1.8.27-scanf-overflows.patch
+Patch4:		htmldoc-1.8.27-fortify-fail.patch
 
 BuildRequires:	openssl-devel libjpeg-devel libpng-devel zlib-devel
 BuildRequires:	fltk-devel libXpm-devel desktop-file-utils
@@ -101,6 +102,9 @@ cd ..
 # fix some scanf overflows (http://www.htmldoc.org/str.php?L214)
 %patch3 -p1 -b .scanf-overflows
 
+# fix limitation of -D_FORTIFY_SOURCE=2
+%patch4 -p1 -b .fortify-fail
+
 
 %build
 %configure
@@ -178,7 +182,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Tue Aug  4 2009 Adam Goode <adam at spicenitz.org> - 1.8.27-12
+* Thu Aug 13 2009 Adam Goode <adam at spicenitz.org> - 1.8.27-12
+- Fix limitation of -D_FORTIFY_SOURCE=2 (#511520)
 - Fix scanf overflows (#512513)
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.27-11