diff options
| author | jvcelak <jvcelak@fedoraproject.org> | 2010-06-28 17:51:21 +0000 |
|---|---|---|
| committer | jvcelak <jvcelak@fedoraproject.org> | 2010-06-28 17:51:21 +0000 |
| commit | 7ac5acadac0dbe17fb1c4ad0c6acfbb52267a284 (patch) | |
| tree | 1d0770b83008c2f0ae091f28dd37b66963edf82d | |
| parent | 5f7566e51af05157e45ee3e45edb3dc648c7b8ed (diff) | |
| download | groff-1_18_1_4-22_fc12.tar.gz groff-1_18_1_4-22_fc12.tar.xz groff-1_18_1_4-22_fc12.zip | |
Fixes SIGSEGV in get_breakpoint, SIGABRT in make_node (#583982).groff-1_18_1_4-22_fc12
| -rw-r--r-- | groff-1.18.1.4-abrt-make_node-hypen.patch | 12 | ||||
| -rw-r--r-- | groff-1.18.1.4-segv-get_breakpoints.patch | 12 | ||||
| -rw-r--r-- | groff.spec | 11 |
3 files changed, 33 insertions, 2 deletions
diff --git a/groff-1.18.1.4-abrt-make_node-hypen.patch b/groff-1.18.1.4-abrt-make_node-hypen.patch new file mode 100644 index 0000000..79b4b3b --- /dev/null +++ b/groff-1.18.1.4-abrt-make_node-hypen.patch @@ -0,0 +1,12 @@ +diff -rup groff-1.18.1.4/src/roff/troff/node.cc groff-1.18.1.4.test/src/roff/troff/node.cc +--- groff-1.18.1.4/src/roff/troff/node.cc 2010-06-28 12:11:58.511549052 +0200 ++++ groff-1.18.1.4.test/src/roff/troff/node.cc 2010-06-28 18:34:45.651674069 +0200 +@@ -4625,7 +4625,7 @@ node *make_node(charinfo *ci, environmen + case charinfo::TRANSLATE_DUMMY: + return new dummy_node; + case charinfo::TRANSLATE_HYPHEN_INDICATOR: +- error("translation to \\% ignored in this context"); ++ error("translation to \\%% ignored in this context"); + break; + } + charinfo *tem = ci->get_translation(); diff --git a/groff-1.18.1.4-segv-get_breakpoints.patch b/groff-1.18.1.4-segv-get_breakpoints.patch new file mode 100644 index 0000000..bc62f3b --- /dev/null +++ b/groff-1.18.1.4-segv-get_breakpoints.patch @@ -0,0 +1,12 @@ +diff -rup groff-1.18.1.4/src/roff/troff/node.cc groff-1.18.1.4.test/src/roff/troff/node.cc +--- groff-1.18.1.4/src/roff/troff/node.cc 2010-06-28 12:11:58.511549052 +0200 ++++ groff-1.18.1.4.test/src/roff/troff/node.cc 2010-06-28 17:48:57.663673790 +0200 +@@ -3450,7 +3450,7 @@ int node::nbreaks() + breakpoint *space_node::get_breakpoints(hunits width, int ns, + breakpoint *rest, int is_inner) + { +- if (next->discardable()) ++ if (next && next->discardable()) + return rest; + breakpoint *bp = new breakpoint; + bp->next = rest; @@ -3,7 +3,7 @@ Summary: A document formatting system Name: groff Version: 1.18.1.4 -Release: 21%{?dist} +Release: 22%{?dist} License: GPLv2 and GFDL Group: Applications/Publishing URL: http://groff.ffii.org @@ -29,6 +29,8 @@ Patch14: groff-1.18.1.4-sectmp.patch Patch15: groff-1.18.1.4-gcc4.3.0.patch Patch16: groff-groffer.patch Patch17: groff-pic2graph-mktemp.patch +Patch18: groff-1.18.1.4-segv-get_breakpoints.patch +Patch19: groff-1.18.1.4-abrt-make_node-hypen.patch Requires: mktemp Requires: /sbin/install-info @@ -93,6 +95,8 @@ System display. %patch15 -p1 -b .gcc43 %patch16 -p1 -b .groffer %patch17 -p1 -b .mktemp +%patch18 -p1 -b .segv-get_breakpoints +%patch19 -p1 -b .abrt-make_node-hypen for i in contrib/mm/{groff_mm,groff_mmse,mmroff}.man \ src/devices/grolbp/grolbp.man; do @@ -209,10 +213,13 @@ exit 0 %endif %changelog +* Mon Jun 28 2010 Jan Vcelak <jvcelak@redhat.com> 1.18.1.4-22 +- Fixes SIGSEGV in get_breakpoint, SIGABRT in make_node (#583982). + * Tue May 04 2010 Jan Vcelak <jvcelak@redhat.com> - 1.18.1.4-21 - Fixes not working pic2graph (#588232). -* Wed Apr 6 2010 Jan Vcelak <jvcelak@redhat.com> - 1.18.1.4-20 +* Wed Apr 6 2010 Jan Vcelak <jvcelak@redhat.com> - 1.18.1.4-20 - Fixes not working groffer (#468102). * Wed Feb 3 2010 Ville Skyttä <ville.skytta@iki.fi> - 1.18.1.4-19 |