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

[Sune Vuorela]

Author: pusling-guest
Date: 2010-05-22 11:58:01 +0000 (Sat, 22 May 2010)
New Revision: 18051

Added:
   trunk/packages/kdegraphics/debian/patches/upstream_fix_strigi_analyzer.diff
Modified:
   trunk/packages/kdegraphics/debian/changelog
   trunk/packages/kdegraphics/debian/control
   trunk/packages/kdegraphics/debian/patches/series
Log:
* Change my email address
* Steal patch from upstream to make nepomuk not crash. Thanks to Jos van den
  Oever

Modified: trunk/packages/kdegraphics/debian/changelog
===================================================================
--- trunk/packages/kdegraphics/debian/changelog	2010-05-22 11:57:13 UTC (rev 18050)
+++ trunk/packages/kdegraphics/debian/changelog	2010-05-22 11:58:01 UTC (rev 18051)
@@ -1,9 +1,15 @@
 kdegraphics (4:4.4.3-2) UNRELEASED; urgency=low
 
+  [ Modestas Vainius ]
   * Update libkexiv2-8.symbols for kfreebsd-i386.
 
- -- Modestas Vainius <modax at debian.org>  Fri, 14 May 2010 17:35:12 +0300
+  [ Sune Vuorela ]
+  * Change my email address
+  * Steal patch from upstream to make nepomuk not crash. Thanks to Jos van den
+    Oever
 
+ -- Sune Vuorela <sune at debian.org>  Sat, 22 May 2010 13:17:17 +0200
+
 kdegraphics (4:4.4.3-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/packages/kdegraphics/debian/control
===================================================================
--- trunk/packages/kdegraphics/debian/control	2010-05-22 11:57:13 UTC (rev 18050)
+++ trunk/packages/kdegraphics/debian/control	2010-05-22 11:58:01 UTC (rev 18051)
@@ -2,7 +2,7 @@
 Section: kde
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>, Armin Berres <armin+debian at space-based.de>, Modestas Vainius <modax at debian.org>
+Uploaders: Sune Vuorela <sune at debian.org>, Fathi Boudra <fabo at debian.org>, Armin Berres <armin+debian at space-based.de>, Modestas Vainius <modax at debian.org>
 Build-Depends: kde-sc-dev-latest (>= 4:4.4.3),
  cdbs (>= 0.4.51), cmake, debhelper (>= 7), quilt, pkg-kde-tools (>= 0.6.4),
  kdelibs5-dev (>= 4:4.4), libphonon-dev (>= 4:4.6.0really4.3.80),

Modified: trunk/packages/kdegraphics/debian/patches/series
===================================================================
--- trunk/packages/kdegraphics/debian/patches/series	2010-05-22 11:57:13 UTC (rev 18050)
+++ trunk/packages/kdegraphics/debian/patches/series	2010-05-22 11:58:01 UTC (rev 18051)
@@ -0,0 +1 @@
+upstream_fix_strigi_analyzer.diff

Added: trunk/packages/kdegraphics/debian/patches/upstream_fix_strigi_analyzer.diff
===================================================================
--- trunk/packages/kdegraphics/debian/patches/upstream_fix_strigi_analyzer.diff	                        (rev 0)
+++ trunk/packages/kdegraphics/debian/patches/upstream_fix_strigi_analyzer.diff	2010-05-22 11:58:01 UTC (rev 18051)
@@ -0,0 +1,50 @@
+http://websvn.kde.org/branches/KDE/4.4/kdegraphics/strigi-analyzer/dvi/dviendanalyzer.cpp?r1=1070858&r2=1129325
+
+Fixes crashes when nepomux indexes things.
+
+Will be part of next upstream release.
+
+--- a/strigi-analyzer/dvi/dviendanalyzer.cpp	2010/01/06 22:46:33	1070858
++++ b/strigi-analyzer/dvi/dviendanalyzer.cpp	2010/05/21 23:10:18	1129325
+@@ -105,6 +105,7 @@
+     // read the header
+     const char* c;
+     int32_t nread = in->read(c, 270, 270);
++    if (nread != 270) return -1;
+     const unsigned char* buffer = (const unsigned char*)c;
+     unsigned char bufferLength = buffer[14];
+     string comment((const char*)buffer+15, bufferLength);
+@@ -112,7 +113,9 @@
+ 
+     // now get total number of pages
+     const int64_t size = in->size();
+-    in->reset(size - 13);
++    if (size < 0) return 0; // the size is unknown, so reading cannot continue
++                            // at the end, this is not an error
++    if (in->reset(size - 13) != size - 13) return -1;
+     nread = in->read(c, 13, 13);
+     if (nread != 13) {
+         return -1;
+@@ -120,11 +123,11 @@
+ 
+     int i = 12; // reset running index i
+     buffer = (const unsigned char*)c;
+-    while (buffer[i] == 223) {
++    while (i >= 4 && buffer[i] == 223) {
+         --i;
+     } // skip all trailing bytes
+ 
+-    if ((buffer[i] != 2) || (i > 8) || (i < 5)) {
++    if (i <= 4 || (buffer[i] != 2) || (i > 8) || (i < 5)) {
+         // wrong file formatx
+         return -1;
+     }
+@@ -136,7 +139,7 @@
+     ptr = (ptr << 8) | buffer[i - 1];
+ 
+     // bytes for total number of pages have a offset of 27 to the beginning of the postamble
+-    in->reset(ptr + 27);
++    if (in->reset(ptr + 27) != ptr + 27) return -1;
+ 
+     // now read total number of pages from file
+     nread = in->read(c, 2, 2);