[SCM] sddm packaging branch, master, updated. debian/0.13.0-1-18-g4b46079

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/sddm.git;a=commitdiff;h=4b46079

The following commit has been merged in the master branch:
commit 4b46079e8dbf3356434348a2e3898239db44f19b
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Nov 18 09:39:27 2016 +0100

    Add new patch: handle-reading-from-a-closed-file-handle.patch
---
 .../handle-reading-from-a-closed-file-handle.patch | 25 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 26 insertions(+)

diff --git a/debian/patches/handle-reading-from-a-closed-file-handle.patch b/debian/patches/handle-reading-from-a-closed-file-handle.patch
new file mode 100644
index 0000000..e7205ab
--- /dev/null
+++ b/debian/patches/handle-reading-from-a-closed-file-handle.patch
@@ -0,0 +1,25 @@
+From: Maximiliano Curia <maxy at gnuservers.com.ar>
+Date: Fri, 11 Nov 2016 10:23:38 +0100
+Subject: handle reading from a closed file handle
+
+---
+ src/daemon/XorgDisplayServer.cpp | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/daemon/XorgDisplayServer.cpp b/src/daemon/XorgDisplayServer.cpp
+index d06d89a..72ba640 100644
+--- a/src/daemon/XorgDisplayServer.cpp
++++ b/src/daemon/XorgDisplayServer.cpp
+@@ -188,6 +188,12 @@ namespace SDDM {
+                 return false;
+             }
+             QByteArray displayNumber = readPipe.readLine();
++            if (displayNumber.isEmpty()) {
++                // the file descriptor was closed without a display number,
++                // the X has probably died.
++                close(pipeFds[0]);
++                return false;
++            }
+             displayNumber.prepend(QByteArray(":"));
+             displayNumber.remove(displayNumber.size() -1, 1); //trim trailing whitespace
+             m_display = QString::fromLocal8Bit(displayNumber);
diff --git a/debian/patches/series b/debian/patches/series
index eb3a11c..9d5b451 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 02_kubuntu_use_breeze.diff
 03_vt7-minimum-vt.diff
 04_set_default_path.diff
+handle-reading-from-a-closed-file-handle.patch

-- 
sddm packaging