[hurd] 03/03: fix zero-byte pipe writes.

[Samuel Thibault]

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

sthibault pushed a commit to branch master
in repository hurd.

commit a8052956a29f4ab7735fdab6cf40c2042ec36506
Author: Samuel Thibault <address@hidden>
Date:   Wed Jun 1 21:26:48 2016 +0000

    fix zero-byte pipe writes.
---
 debian/changelog                                   |  2 ++
 .../git-293e86998748bae2d7a8179ad198ec3452f0d472   | 25 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 28 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 270a195..faad1a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ hurd (1:0.8.git20160522-3) unstable; urgency=medium
   * control: Bump Standards-Version to 3.9.8 (no change)
   * patches/git-malloc-hook: Cherry-pick from upstream to fix potential
     mach-defpager hang.
+  * patches/git-293e86998748bae2d7a8179ad198ec3452f0d472: Cherry-pick from
+    upstream to fix zero-byte pipe writes.
 
  -- Samuel Thibault <address@hidden>  Wed, 01 Jun 2016 21:17:45 +0000
 
diff --git a/debian/patches/git-293e86998748bae2d7a8179ad198ec3452f0d472 
b/debian/patches/git-293e86998748bae2d7a8179ad198ec3452f0d472
new file mode 100644
index 0000000..85a8057
--- /dev/null
+++ b/debian/patches/git-293e86998748bae2d7a8179ad198ec3452f0d472
@@ -0,0 +1,25 @@
+commit 293e86998748bae2d7a8179ad198ec3452f0d472
+Author: Richard Braun <address@hidden>
+Date:   Wed Jun 1 23:19:19 2016 +0200
+
+    Fix pipe_send() with no data
+    
+    * libpipe/pipe.c (pipe_send): Set value pointed to by amount to 0 if
+    if nothing is written.
+
+diff --git a/libpipe/pipe.c b/libpipe/pipe.c
+index c3d2a28..0b53921 100644
+--- a/libpipe/pipe.c
++++ b/libpipe/pipe.c
+@@ -319,7 +319,10 @@ pipe_send (struct pipe *pipe, int noblock, void *source,
+ 
+   /* Nothing to do.  */
+   if (data_len == 0 && control_len == 0 && num_ports == 0)
+-    return 0;
++    {
++      *amount = 0;
++      return 0;
++    }
+ 
+   err = pipe_wait_writable (pipe, noblock);
+   if (err)
diff --git a/debian/patches/series b/debian/patches/series
index e06fedf..3a3f8a6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -31,3 +31,4 @@ libports-iterate-refcount.patch
 git-0ab3825f250486453892e3e18a702a44538bff6d
 git-60d14f5b3c4ea27af6f4220a15947c328bc888ee
 git-malloc-hook
+git-293e86998748bae2d7a8179ad198ec3452f0d472

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