rpms/groff/F-13 groff-1.18.1.4-abrt-make_node-hypen.patch, NONE, 1.1 groff-1.18.1.4-segv-get_breakpoints.patch, NONE, 1.1 groff.spec, 1.69, 1.70

[jvcelak]

Author: jvcelak

Update of /cvs/pkgs/rpms/groff/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv18089

Modified Files:
	groff.spec 
Added Files:
	groff-1.18.1.4-abrt-make_node-hypen.patch 
	groff-1.18.1.4-segv-get_breakpoints.patch 
Log Message:
Fixes SIGSEGV in get_breakpoint, SIGABRT in make_node (#583982)



groff-1.18.1.4-abrt-make_node-hypen.patch:
 node.cc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE groff-1.18.1.4-abrt-make_node-hypen.patch ---
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();

groff-1.18.1.4-segv-get_breakpoints.patch:
 node.cc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE groff-1.18.1.4-segv-get_breakpoints.patch ---
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;


Index: groff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/groff/F-13/groff.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- groff.spec	27 May 2010 13:17:58 -0000	1.69
+++ groff.spec	28 Jun 2010 17:41:26 -0000	1.70
@@ -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
@@ -28,6 +28,8 @@ Patch13: groff-1.18.1.1-spacefix.patch
 Patch14: groff-1.18.1.4-sectmp.patch
 Patch15: groff-1.18.1.4-gcc4.3.0.patch
 Patch16: groff-groffer.patch
+Patch17: groff-1.18.1.4-segv-get_breakpoints.patch
+Patch18: groff-1.18.1.4-abrt-make_node-hypen.patch
  
 Requires: mktemp
 Requires: /sbin/install-info
@@ -91,6 +93,8 @@ System display.
 %patch14 -p1 -b .sectmp
 %patch15 -p1 -b .gcc43
 %patch16 -p1 -b .groffer
+%patch17 -p1 -b .segv-get_breakpoints
+%patch18 -p1 -b .abrt-make_node-hypen
 
 for i in contrib/mm/{groff_mm,groff_mmse,mmroff}.man \
 		src/devices/grolbp/grolbp.man; do
@@ -207,10 +211,13 @@ exit 0
 %endif
 
 %changelog
+* Mon Jun 28 2010 Jan Vcelak <jvcelak at redhat.com> 1.18.1.4-22
+- Fixes SIGSEGV in get_breakpoint, SIGABRT in make_node (#583982).
+
 * Thu May 27 2010 Jan Vcelak <jvcelak at redhat.com> 1.18.1.4-21
 - Version bump to preserve upgrade path.
 
-* Wed Apr 6 2010 Jan Vcelak	<jvcelak at redhat.com> - 1.18.1.4-20
+* Wed Apr 6 2010 Jan Vcelak <jvcelak at redhat.com> - 1.18.1.4-20
 - Fixes not working groffer (#468102).
 
 * Wed Feb 3 2010 Ville Skyttä <ville.skytta at iki.fi> - 1.18.1.4-19