- Fix the infinite loop in splitting paragraphs (#618483)

paps-fix-loop-in-split.patch

@@ -0,0 +1,31 @@
+From 6c3fa9959dd454938378ade2fec8e84cee7d6916 Mon Sep 17 00:00:00 2001
+From: Akira TAGOH <tagoh@redhat.com>
+Date: Tue, 27 Jul 2010 12:19:30 +0900
+Subject: [PATCH 1/2] Fix rhbz#618483: texttopaps becoms runaway memory hog
+
+        * src/paps.c (split_text_into_paragraphs): fix a infinite loop
+        when non-printable characters are in the text.
+---
+ src/paps.c |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+ 	* paps.c: Erased --justify option since it is not implemented in 
+diff --git a/src/paps.c b/src/paps.c
+index 72dbaad..dcef349 100644
+--- a/src/paps.c
++++ b/src/paps.c
+@@ -835,7 +835,10 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ 				      goto fail;
+ 			      }
+ 			      for (i = 0; i < len; i++) {
+-				      wwidth += wcwidth(wtext[i]);
++				      gssize w = wcwidth(wtext[i]);
++
++				      if (w >= 0)
++					      wwidth += w;
+ 				      if (wwidth > col)
+ 					      break;
+ 				      wnewtext[i] = wtext[i];
+-- 
+1.7.1.1
+

paps.spec

@@ -1,6 +1,6 @@
 Name:           paps
 Version:        0.6.8
-Release:	13%{?dist}
+Release:        14%{?dist}
 
 License:        LGPLv2+
 URL:            http://paps.sourceforge.net/
@@ -23,6 +23,7 @@ Patch51:	paps-cpilpi.patch
 Patch52:        paps-dsc-compliant.patch
 Patch53:        paps-autoconf262.patch
 Patch54:        paps-fix-cpi.patch
+Patch55:	paps-fix-loop-in-split.patch
 
 Summary:        Plain Text to PostScript converter
 Group:          Applications/Publishing
@@ -59,6 +60,7 @@ applications using paps API.
 %patch52 -p1 -b .dsc
 %patch53 -p1 -b .autoconf262
 %patch54 -p1 -b .fixcpi
+%patch55 -p1 -b .loop
 libtoolize -f -c
 autoreconf
 
@@ -106,6 +108,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libpaps.so
 
 %changelog
+* Tue Jul 27 2010 Akira TAGOH <tagoh@redhat.com> - 0.6.8-14
+- Fix the infinite loop in splitting paragraphs (#618483)
+
 * Fri Mar 12 2010 Akira TAGOH <tagoh@redhat.com> - 0.6.8-13
 - Fix the directory's group ownership. (#572733)