[Pkg-cli-apps-commits] [SCM] keepass2 branch, master, updated. debian/2.15+dfsg-2-12-g00a56ed

[Julian Taylor]

The following commit has been merged in the master branch:
commit dcb6001723849724431b2c6825f18ef81379f3b5
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date:   Tue May 17 13:50:32 2011 +0200

    patch: fix ftp database access

diff --git a/debian/patches/17_fix-ftp-stream-read.patch b/debian/patches/17_fix-ftp-stream-read.patch
new file mode 100644
index 0000000..b7d5c76
--- /dev/null
+++ b/debian/patches/17_fix-ftp-stream-read.patch
@@ -0,0 +1,31 @@
+From: Julian Taylor <jtaylor.debian at googlemail.com>
+Date: Tue, 17 May 2011 13:36:19 +0200
+Subject: fix ftp stream read
+
+mono throws NullReferenceException when reading past end of FtpDataStream
+Applied-Upstream: 2.16
+---
+ KeePassLib/Serialization/HashedBlockStream.cs |    9 ++++++++-
+ 1 files changed, 8 insertions(+), 1 deletions(-)
+
+diff --git a/KeePassLib/Serialization/HashedBlockStream.cs b/KeePassLib/Serialization/HashedBlockStream.cs
+index 6383017..862064c 100644
+--- a/KeePassLib/Serialization/HashedBlockStream.cs
++++ b/KeePassLib/Serialization/HashedBlockStream.cs
+@@ -206,7 +206,14 @@ namespace KeePassLib.Serialization
+ 			if((pbStoredHash == null) || (pbStoredHash.Length != 32))
+ 				throw new InvalidDataException();
+ 
+-			int nBufferSize = m_brInput.ReadInt32();
++			int nBufferSize = 0;
++			// mono throws NullReferenceException when reading past end of FtpDataStream
++			try
++			{
++				nBufferSize = m_brInput.ReadInt32();
++			}
++			catch {}
++
+ 			if(nBufferSize < 0)
+ 				throw new InvalidDataException();
+ 
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index fe9dc38..e335a7e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@
 14_fix-WebClient-for-ftp-access-under-mono.patch
 15_add-xdotool-keysym-mapping-for-square-brackets.patch
 16_increase-tab-size-to-avoid-crash-on-changing-tabs.patch
+17_fix-ftp-stream-read.patch

-- 
keepass2