[hurd] 01/01: patches/dl_origin.patch: Fix off-by-one

[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 9e8871ca21989dc6b1c0f828d70b6df607510ffa
Author: Samuel Thibault <address@hidden>
Date:   Fri May 1 20:23:31 2015 +0000

    patches/dl_origin.patch: Fix off-by-one
---
 debian/changelog               | 6 ++++++
 debian/patches/dl_origin.patch | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 51894e1..8ddb429 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+hurd (1:0.6-4) unstable; urgency=medium
+
+  * patches/dl_origin.patch: Fix off-by-one.
+
+ -- Samuel Thibault <address@hidden>  Fri, 01 May 2015 20:23:15 +0000
+
 hurd (1:0.6-3) unstable; urgency=medium
 
   * patches/dl_origin.patch: New patch to enable $ORIGIN expansion support in
diff --git a/debian/patches/dl_origin.patch b/debian/patches/dl_origin.patch
index 7d5cd35..f2db414 100644
--- a/debian/patches/dl_origin.patch
+++ b/debian/patches/dl_origin.patch
@@ -83,9 +83,9 @@ Index: hurd-debian/exec/exec.c
 +                           PROT_READ|PROT_WRITE, MAP_ANON, 0, 0);
 +
 +          memcpy (new_envp, ld_origin_s + 1, sizeof (ld_origin_s) - 2);
-+          memcpy (new_envp + sizeof (ld_origin_s) - 1, filename, pathlen);
++          memcpy (new_envp + sizeof (ld_origin_s) - 2, filename, pathlen);
 +          new_envp [sizeof (ld_origin_s) - 2 + pathlen] = 0;
-+          memcpy (new_envp + sizeof (ld_origin_s) - 1 + pathlen, envp, 
envplen);
++          memcpy (new_envp + sizeof (ld_origin_s) - 2 + pathlen + 1, envp, 
envplen);
 +        }
 +
 +      if (! envp_copy)

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