diff -Nru plymouth-0.9.0/debian/changelog plymouth-0.9.0/debian/changelog --- plymouth-0.9.0/debian/changelog 2014-09-21 22:35:56.000000000 +0100 +++ plymouth-0.9.0/debian/changelog 2014-09-25 18:32:06.000000000 +0100 @@ -1,3 +1,11 @@ +plymouth (0.9.0-0ubuntu6) UNRELEASED; urgency=medium + + * d/p/ubuntu-seat-terminal-may-be-null.patch -- check that the + seat->terminal is valid before instantiating a text terminal + on it. (LP: #1371651) + + -- Andy Whitcroft Thu, 25 Sep 2014 18:31:09 +0100 + plymouth (0.9.0-0ubuntu5) utopic; urgency=medium * Adjust grub snippet that sets purple background color - set alpha to diff -Nru plymouth-0.9.0/debian/patches/series plymouth-0.9.0/debian/patches/series --- plymouth-0.9.0/debian/patches/series 2014-09-21 22:35:56.000000000 +0100 +++ plymouth-0.9.0/debian/patches/series 2014-09-25 18:27:43.000000000 +0100 @@ -17,3 +17,4 @@ 0007-udev-seat-tag.patch 0008-show-delay.patch 0001-Bump-point-release-and-ABI-versions-of-libraries.patch +ubuntu-seat-terminal-may-be-null.patch diff -Nru plymouth-0.9.0/debian/patches/ubuntu-seat-terminal-may-be-null.patch plymouth-0.9.0/debian/patches/ubuntu-seat-terminal-may-be-null.patch --- plymouth-0.9.0/debian/patches/ubuntu-seat-terminal-may-be-null.patch 1970-01-01 01:00:00.000000000 +0100 +++ plymouth-0.9.0/debian/patches/ubuntu-seat-terminal-may-be-null.patch 2014-09-25 18:30:48.000000000 +0100 @@ -0,0 +1,26 @@ +Description: seat->terminal may be null + seat->terminal may well be null, other places in the code check + for this. When building terminals we unconditionally try and add + text displays for every terminal. Check the seat->terminal is valid + before attempting this. +Author: Andy Whitcroft +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1371651 +Last-Update: 2014-09-25 + +Index: plymouth-0.9.0/src/libply-splash-core/ply-seat.c +=================================================================== +--- plymouth-0.9.0.orig/src/libply-splash-core/ply-seat.c 2014-09-25 17:23:31.000000000 +0100 ++++ plymouth-0.9.0/src/libply-splash-core/ply-seat.c 2014-09-25 18:11:04.864438519 +0100 +@@ -102,6 +102,12 @@ + { + ply_text_display_t *display; + ++ if (!seat->terminal) ++ { ++ ply_trace ("adding text display for terminal, no terminal"); ++ return; ++ } ++ + if (!ply_terminal_is_open (seat->terminal)) + { + if (!ply_terminal_open (seat->terminal))