Accepting request 32582 from Publishing

Copy from Publishing/htmldoc based on submit request 32582 from user coolo

OBS-URL: https://build.opensuse.org/request/show/32582
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/htmldoc?expand=0&rev=6
This commit is contained in:
OBS User autobuild 2010-02-18 14:11:48 +00:00 committed by Git OBS Bridge
parent 0853e1bfbf
commit beb7f3b2ae
3 changed files with 19 additions and 1 deletions

11
htmldoc-fortify.diff Normal file
View File

@ -0,0 +1,11 @@
--- ./htmldoc/ps-pdf.cxx.orig 2010-02-15 11:13:11.000000000 +0100
+++ ./htmldoc/ps-pdf.cxx 2010-02-15 11:17:02.000000000 +0100
@@ -8615,7 +8615,7 @@
return (NULL);
}
// Safe because buffer is allocated...
- strcpy((char *)r->data.text.buffer, (char *)data);
+ memcpy((char *)r->data.text.buffer, data, strlen ((char *)data) + 1);
get_color(_htmlTextColor, r->data.text.rgb);
break;
case RENDER_IMAGE :

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Feb 15 11:18:57 CET 2010 - rguenther@suse.de
- Fix stricter fortification fallout with GCC 4.5.
-------------------------------------------------------------------
Fri Dec 11 15:27:38 CET 2009 - lmuelle@suse.de

View File

@ -25,11 +25,12 @@ Group: Productivity/Publishing/HTML/Tools
Url: http://htmldoc.org/
AutoReqProv: on
Version: 1.8.27
Release: 172
Release: 173
Summary: HTML Processor that Generates HTML, PostScript, and PDF Files
Source: %{name}-%{version}-source.tar.bz2
Patch: %{name}-docpath.diff
Patch1: htmldoc_CVE-2009-3050_535943.diff
Patch2: htmldoc-fortify.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define DOCDIR %{_datadir}/doc/packages/%{name}
@ -48,6 +49,7 @@ Authors:
%setup
%patch
%patch1 -p1
%patch2
%build
%{?suse_update_config:%{suse_update_config -f}}