Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdepimlibs.git;a=commitdiff;h=b146c48
The following commit has been merged in the wheezy branch:
commit b146c483234438182f96a81a81bb227eaa5f7397
Author: Pino Toscano <pino at debian.org>
Date: Tue Oct 23 22:25:06 2012 +0200
stop reading when reaching the end of streams
backport upstream commit f142cc25b5620c2d1037cc6cd270b1cf301b5380 (adapted to the 4.8 codebase)
---
debian/changelog | 4 +++
debian/patches/series | 1 +
...m_b92782580756b3858f0381a5200b79688ab0b0a2.diff | 28 ++++++++++++++++++++
3 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 589e8ab..51dedde 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
kdepimlibs (4:4.8.4-2) UNRELEASED; urgency=low
+ [ Pino Toscano ]
+ * Backport upstream commit f142cc25b5620c2d1037cc6cd270b1cf301b5380
+ (adapted to the 4.8 codebase) to stop reading when reaching the end of
+ streams; patch upstream_b92782580756b3858f0381a5200b79688ab0b0a2.diff.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Tue, 23 Oct 2012 22:13:08 +0200
diff --git a/debian/patches/series b/debian/patches/series
index dde0990..a17eb0d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
crash_when_marking_folder_read.diff
+upstream_b92782580756b3858f0381a5200b79688ab0b0a2.diff
03_hide_akonadi_progressbar.diff
diff --git a/debian/patches/upstream_b92782580756b3858f0381a5200b79688ab0b0a2.diff b/debian/patches/upstream_b92782580756b3858f0381a5200b79688ab0b0a2.diff
new file mode 100644
index 0000000..d8dcde4
--- /dev/null
+++ b/debian/patches/upstream_b92782580756b3858f0381a5200b79688ab0b0a2.diff
@@ -0,0 +1,28 @@
+Author: Volker Krause <vkrause at kde.org>
+Author: David Faure <faure at kde.org>
+Description: Don't keep reading when we reached the end of the stream.
+ .
+ This should prevent corrupt change replay files from eating up all your
+ memory.
+Applied-Upstream: 4.9.3, commit:f142cc25b5620c2d1037cc6cd270b1cf301b5380
+
+--- a/akonadi/changerecorder_p.h
++++ b/akonadi/changerecorder_p.h
+@@ -138,7 +138,7 @@ class AKONADI_TESTS_EXPORT Akonadi::Chan
+ QQueue<NotificationMessage> list;
+
+ stream >> size;
+- for ( qulonglong i = 0; i < size; ++i ) {
++ for ( qulonglong i = 0; i < size && !stream.atEnd(); ++i ) {
+ NotificationMessage msg;
+
+ stream >> sessionId;
+@@ -186,7 +186,7 @@ class AKONADI_TESTS_EXPORT Akonadi::Chan
+ QStringList list;
+
+ stream >> size;
+- for ( qulonglong i = 0; i < size; ++i ) {
++ for ( qulonglong i = 0; i < size && !stream.atEnd(); ++i ) {
+ stream >> sessionId;
+ stream >> type;
+ stream >> operation;
--
KDE PIM Libraries module packaging