Fixed word-wrapping crash in tokenizer (bug #870639).

This commit is contained in:
Tim Waugh 2013-05-14 16:17:48 +01:00
parent f4f89bfa97
commit b3d5b46e06
2 changed files with 18 additions and 1 deletions

View File

@ -0,0 +1,12 @@
diff -up enscript-1.6.5.2/src/psgen.c.bufpos-crash enscript-1.6.5.2/src/psgen.c
--- enscript-1.6.5.2/src/psgen.c.bufpos-crash 2013-05-13 16:18:05.119393660 +0100
+++ enscript-1.6.5.2/src/psgen.c 2013-05-13 16:19:17.634739778 +0100
@@ -1928,7 +1928,7 @@ get_next_token (InputStream *is, double
bufpos--;
}
/* Check the octal notations "\\%03o". */
- else if (bufpos - 2 > w
+ else if (bufpos > 2 && bufpos - 2 > w
&& ISOCTAL (buffer[bufpos])
&& ISOCTAL (buffer[bufpos - 1])
&& ISOCTAL (buffer[bufpos - 2])

View File

@ -1,7 +1,7 @@
Summary: A plain ASCII to PostScript converter Summary: A plain ASCII to PostScript converter
Name: enscript Name: enscript
Version: 1.6.5.2 Version: 1.6.5.2
Release: 5%{?dist} Release: 6%{?dist}
License: GPLv3+ License: GPLv3+
Group: Applications/Publishing Group: Applications/Publishing
URL: http://www.gnu.org/software/enscript URL: http://www.gnu.org/software/enscript
@ -25,6 +25,7 @@ Patch8: enscript-wrap_header.patch
Patch9: enscript-1.6.4-rh457719.patch Patch9: enscript-1.6.4-rh457719.patch
Patch10:enscript-1.6.4-rh457720.patch Patch10:enscript-1.6.4-rh457720.patch
Patch12:enscript-rh477382.patch Patch12:enscript-rh477382.patch
Patch13: enscript-bufpos-crash.patch
Requires(preun): /sbin/install-info Requires(preun): /sbin/install-info
Requires(post): /sbin/install-info Requires(post): /sbin/install-info
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -49,6 +50,7 @@ includes many options for customizing printouts
%patch9 -p1 -b .rh457719 %patch9 -p1 -b .rh457719
%patch10 -p1 -b .rh457720 %patch10 -p1 -b .rh457720
%patch12 -p1 -b .rh477382 %patch12 -p1 -b .rh477382
%patch13 -p1 -b .bufpos-crash
%{__tar} -C states/hl -zxf %{SOURCE1} ruby.st %{__tar} -C states/hl -zxf %{SOURCE1} ruby.st
install -pm 644 %{SOURCE2} states/hl/php.st install -pm 644 %{SOURCE2} states/hl/php.st
@ -109,6 +111,9 @@ fi
%config(noreplace) %{_sysconfdir}/enscript.cfg %config(noreplace) %{_sysconfdir}/enscript.cfg
%changelog %changelog
* Mon May 13 2013 Tim Waugh <twaugh@redhat.com> - 1.6.5.2-6
- Fixed word-wrapping crash in tokenizer (bug #870639).
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.5.2-5 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.5.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild