[boinc] 01/01: Fix crash on headless servers

[Gianfranco Costamagna]

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

locutusofborg-guest pushed a commit to branch master
in repository boinc.

commit ba609171fef15d0975ac32d13ecc0a04df941cb4
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Thu May 12 17:08:02 2016 +0200

    Fix crash on headless servers
---
 debian/changelog                                   |  4 +++
 .../8416d8a1a423535fbc5d4e7416d6eac8ac5c050b.patch | 30 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 35 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d2450e9..0acdde4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ boinc (7.6.32+dfsg-2) UNRELEASED; urgency=medium
   [ Steffen Moeller ]
   * Reintroduced dh_strip override for --dbgsym-migration
 
+  [ Gianfranco Costamagna ]
+  * debian/patches/8416d8a1a423535fbc5d4e7416d6eac8ac5c050b.patch:
+    cherry-pick to fix crash on headless servers (LP: #1581029)
+
  -- Gianfranco Costamagna <locutusofborg at debian.org>  Thu, 12 May 2016 12:01:32 +0200
 
 boinc (7.6.32+dfsg-1exp1) experimental; urgency=medium
diff --git a/debian/patches/8416d8a1a423535fbc5d4e7416d6eac8ac5c050b.patch b/debian/patches/8416d8a1a423535fbc5d4e7416d6eac8ac5c050b.patch
new file mode 100644
index 0000000..9994fc4
--- /dev/null
+++ b/debian/patches/8416d8a1a423535fbc5d4e7416d6eac8ac5c050b.patch
@@ -0,0 +1,30 @@
+From 8416d8a1a423535fbc5d4e7416d6eac8ac5c050b Mon Sep 17 00:00:00 2001
+From: Preston Maness <aggroskater at gmail.com>
+Date: Tue, 26 Apr 2016 23:06:57 -0500
+Subject: [PATCH] Fix #1530 (null pointer dereference)
+
+---
+ client/hostinfo_unix.cpp | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/client/hostinfo_unix.cpp b/client/hostinfo_unix.cpp
+index 38a0cf5..54f577e 100644
+--- a/client/hostinfo_unix.cpp
++++ b/client/hostinfo_unix.cpp
+@@ -1989,11 +1989,12 @@ const vector<string> X_display_values_initialize() {
+         "[idle_detection] Error (%d) opening %s.", errno, dir.c_str());
+     }
+   }
+-
+-  while ((dirp = readdir(dp)) != NULL) {
+-    display_values.push_back(string(dirp->d_name));
++  else {
++    while ((dirp = readdir(dp)) != NULL) {
++      display_values.push_back(string(dirp->d_name));
++    }
++    closedir(dp);
+   }
+-  closedir(dp);
+ 
+   // Get rid of non-matching elements and format the matching ones.
+   for ( it = display_values.begin() ; it != display_values.end() ; ) {
diff --git a/debian/patches/series b/debian/patches/series
index a08c437..0f19e9a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -30,3 +30,4 @@ disable_silent_rules.patch
 envargs.patch
 fix-underlinking.patch
 static_scientific_apps.patch
+8416d8a1a423535fbc5d4e7416d6eac8ac5c050b.patch

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