[med-svn] [odil] 01/01: Fix tests when building i386

[Julien Lamy]

This is an automated email from the git hooks/post-receive script.

lamy-guest pushed a commit to branch master
in repository odil.

commit 1b0a6fe6018903b2e358126e610a3282f9d95efe
Author: Julien Lamy <lamy at unistra.fr>
Date:   Tue Jun 21 15:31:28 2016 +0200

    Fix tests when building i386
---
 debian/changelog               |  6 ++++++
 debian/patches/series          |  1 +
 debian/patches/writer-ds.patch | 20 ++++++++++++++++++++
 3 files changed, 27 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index cc16167..541e569 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+odil (0.7.0-2) unstable; urgency=medium
+
+  * Fix tests when building i386
+
+ -- Julien Lamy <lamy at unistra.fr>  Tue, 21 Jun 2016 14:29:24 +0200
+
 odil (0.7.0-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/series b/debian/patches/series
index 8f508cf..689c9db 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 cli-import-path.patch
 sort-cmake-filelists.patch
+writer-ds.patch
diff --git a/debian/patches/writer-ds.patch b/debian/patches/writer-ds.patch
new file mode 100644
index 0000000..2cfe0d7
--- /dev/null
+++ b/debian/patches/writer-ds.patch
@@ -0,0 +1,20 @@
+Subject: Fix crash when running tests on i386
+Origin: https://github.com/lamyj/odil/commit/05c555a06a76ebab5c70507ff602e931d1441391
+Bug: https://github.com/lamyj/odil/issues/23
+Forwarded: not-needed
+--- a/src/odil/Writer.cpp
++++ b/src/odil/Writer.cpp
+@@ -364,9 +364,10 @@ Writer::Visitor
+                 throw Exception("DS items must be finite");
+             }
+             
+-            // Each item in the DS is at most 16 bytes.
+-            static char buffer[16];
+-            write_ds(item, buffer, 16);
++            // Each item in the DS is at most 16 bytes, account for NUL at end
++            static unsigned int const buffer_size=16+1;
++            static char buffer[buffer_size];
++            write_ds(item, buffer, buffer_size);
+             auto const length = strlen(buffer);
+             
+             this->stream.write(buffer, length);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/odil.git