rev 11873 - in trunk/packages/kdegraphics/debian: . patches

[Ana Beatriz Guerrero López]

Author: ana
Date: 2008-08-08 14:20:32 +0000 (Fri, 08 Aug 2008)
New Revision: 11873

Added:
   trunk/packages/kdegraphics/debian/patches/25_ksvg_493363_handle_odd_coordinates.diff
Modified:
   trunk/packages/kdegraphics/debian/changelog
   trunk/packages/kdegraphics/debian/control
Log:
Let's fix #493363



Modified: trunk/packages/kdegraphics/debian/changelog
===================================================================
--- trunk/packages/kdegraphics/debian/changelog	2008-08-08 09:59:31 UTC (rev 11872)
+++ trunk/packages/kdegraphics/debian/changelog	2008-08-08 14:20:32 UTC (rev 11873)
@@ -1,9 +1,16 @@
-kdegraphics (4:3.5.9-3) UNRELEASED; urgency=low
+kdegraphics (4:3.5.9-3) unstable; urgency=low
 
   +++ Changes by Pino Toscano:
 
   * Make kviewshell provide the virtual package djvu-viewer. (Closes: #493361)
 
+  +++ Changes by Ana Beatriz Guerrero Lopez:
+
+  * Patch infinite memory allocation with malformed SVG files, it checks that 
+    there are an even number of elements in 
+    KSVG::SVGAnimatedPointsImpl::parsePoints. 
+    Thanks a lot to Steve Cotton. (Closes: #493363) 
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 02 Jul 2008 15:00:12 +0100
 
 kdegraphics (4:3.5.9-2) unstable; urgency=low

Modified: trunk/packages/kdegraphics/debian/control
===================================================================
--- trunk/packages/kdegraphics/debian/control	2008-08-08 09:59:31 UTC (rev 11872)
+++ trunk/packages/kdegraphics/debian/control	2008-08-08 14:20:32 UTC (rev 11873)
@@ -335,6 +335,7 @@
 Section: graphics
 Architecture: any
 Depends: ${shlibs:Depends}
+Provides: djvu-viewer
 Description: generic framework for viewer applications in KDE
  KViewShell is a generic viewing framework that allows the graphical
  applications, such as the kview image viewer, to be embedded in other

Added: trunk/packages/kdegraphics/debian/patches/25_ksvg_493363_handle_odd_coordinates.diff
===================================================================
--- trunk/packages/kdegraphics/debian/patches/25_ksvg_493363_handle_odd_coordinates.diff	                        (rev 0)
+++ trunk/packages/kdegraphics/debian/patches/25_ksvg_493363_handle_odd_coordinates.diff	2008-08-08 14:20:32 UTC (rev 11873)
@@ -0,0 +1,19 @@
+Sun Aug  3 18:26:12 BST 2008  Steve Cotton <steve at s.cotton.clara.co.uk>
+  * 493363 Check that there are an even number of elements in KSVG::SVGAnimatedPointsImpl::parsePoints
+diff -rN -u old-kdegraphics-3.5.9/ksvg/impl/SVGAnimatedPointsImpl.cc new-kdegraphics-3.5.9/ksvg/impl/SVGAnimatedPointsImpl.cc
+--- old-kdegraphics-3.5.9/ksvg/impl/SVGAnimatedPointsImpl.cc	2008-08-03 18:30:36.000000000 +0100
++++ new-kdegraphics-3.5.9/ksvg/impl/SVGAnimatedPointsImpl.cc	2008-08-03 18:30:37.000000000 +0100
+@@ -79,6 +79,12 @@
+ 	_points = _points.simplifyWhiteSpace();
+ 
+ 	QStringList pointList = QStringList::split(' ', _points);
++
++	/* The list is of (x,y) pairs, so it must have an even
++	 * number of elements. */
++	if (pointList.count() % 2)
++		return;
++
+ 	for(QStringList::Iterator it = pointList.begin(); it != pointList.end(); it++)
+ 	{
+ 		SVGPointImpl *point = SVGSVGElementImpl::createSVGPoint();
+