[hurd] 01/01: exec_filename_fix.patch: Fix spurious port deallocation.

[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 4aa93d03e1288ca20f1b2dc47435858853713e5f
Author: Samuel Thibault <address@hidden>
Date:   Sun Feb 2 19:18:53 2014 +0100

    exec_filename_fix.patch: Fix spurious port deallocation.
---
 debian/changelog                       |  1 +
 debian/patches/exec_filename_fix.patch | 13 +++++--------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9cc7be8..cba22b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 hurd (1:0.5.git20140113-2) UNRELEASED; urgency=low
 
   * hurd.hurd-console.init: Actually make ENABLE=false in default work.
+  * patches/exec_filename_fix.patch: Fix spurious port deallocation.
 
  -- Samuel Thibault <address@hidden>  Tue, 19 Nov 2013 00:21:47 +0100
 
diff --git a/debian/patches/exec_filename_fix.patch 
b/debian/patches/exec_filename_fix.patch
index 110cbd2..71836d9 100644
--- a/debian/patches/exec_filename_fix.patch
+++ b/debian/patches/exec_filename_fix.patch
@@ -25,8 +25,6 @@ Fix this by skipping the identity test if file_name_exec is 
provided.
  exec/hashexec.c |   91 ++++++++++++++++++++++++++++++-------------------------
  1 file changed, 50 insertions(+), 41 deletions(-)
 
-diff --git a/exec/hashexec.c b/exec/hashexec.c
-index 9f0b071..3f6f916 100644
 --- a/exec/hashexec.c
 +++ b/exec/hashexec.c
 @@ -231,11 +231,12 @@ check_hashbang (struct execdata *e,
@@ -47,7 +45,7 @@ index 9f0b071..3f6f916 100644
  
              error_t error;
              char *name;
-@@ -271,50 +272,58 @@ check_hashbang (struct execdata *e,
+@@ -271,51 +272,59 @@ check_hashbang (struct execdata *e,
                  return err;
                }
  
@@ -129,8 +127,11 @@ index 9f0b071..3f6f916 100644
                    }
 -                else if (free_name)
 -                  free (name);
++
++                mach_port_deallocate (mach_task_self (), fileid);
                }
  
+-            mach_port_deallocate (mach_task_self (), fileid);
 +            if (!error)
 +              {
 +                file_name = name;
@@ -138,10 +139,6 @@ index 9f0b071..3f6f916 100644
 +              }
 +            else if (free_name)
 +              free (name);
-+
-             mach_port_deallocate (mach_task_self (), fileid);
            }
  
--- 
-1.7.10.4
-
+         if (file_name == NULL)

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