[hurd] 01/03: patches/exec_set_exe.patch: Fix crash in procfs when exe is empty

[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 0db7ac5081762a60cf37a30c927f6eb0e6a0f579
Author: Samuel Thibault <address@hidden>
Date:   Thu Mar 9 23:02:58 2017 +0000

    patches/exec_set_exe.patch: Fix crash in procfs when exe is empty
---
 debian/changelog                  |  1 +
 debian/patches/exec_set_exe.patch | 12 +++++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 720cd97..6c3be9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 hurd (1:0.9.git20170304-2) UNRELEASED; urgency=medium
 
   * Use canonical anonscm vcs URL.
+  * patches/exec_set_exe.patch: Fix crash in procfs when exe is empty.
 
  -- Samuel Thibault <address@hidden>  Sat, 04 Mar 2017 01:17:55 +0000
 
diff --git a/debian/patches/exec_set_exe.patch 
b/debian/patches/exec_set_exe.patch
index 30bbcbe..408feac 100644
--- a/debian/patches/exec_set_exe.patch
+++ b/debian/patches/exec_set_exe.patch
@@ -280,12 +280,18 @@ Index: hurd-debian/procfs/process.c
 ===================================================================
 --- hurd-debian.orig/procfs/process.c
 +++ hurd-debian/procfs/process.c
-@@ -95,6 +95,13 @@ static int args_filename_length (const c
+@@ -95,6 +95,19 @@ static int args_filename_length (const c
  /* Actual content generators */
  
  static ssize_t
 +process_file_gc_exe (struct proc_stat *ps, char **contents)
 +{
++  if (proc_stat_exe_len (ps) == 0)
++    {
++      *contents = "-";
++      return 1;
++    }
++
 +  *contents = proc_stat_exe(ps);
 +  return proc_stat_exe_len(ps);
 +}
@@ -294,7 +300,7 @@ Index: hurd-debian/procfs/process.c
  process_file_gc_cmdline (struct proc_stat *ps, char **contents)
  {
    *contents = proc_stat_args(ps);
-@@ -410,6 +417,14 @@ process_file_make_node (void *dir_hook,
+@@ -410,6 +423,14 @@ process_file_make_node (void *dir_hook,
    return np;
  }
  
@@ -309,7 +315,7 @@ Index: hurd-debian/procfs/process.c
  /* Stat needs its own constructor in order to set its mode according to
     the --stat-mode command-line option.  */
  static struct node *
-@@ -425,6 +440,17 @@ process_stat_make_node (void *dir_hook,
+@@ -425,6 +446,17 @@ process_stat_make_node (void *dir_hook,
  
  static struct procfs_dir_entry entries[] = {
    {

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