rpms/plymouth/F-12 fix-text-shutdown-crash.patch, NONE, 1.1 plymouth.spec, 1.155, 1.156

[Ray Strode]

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6585

Modified Files:
	plymouth.spec 
Added Files:
	fix-text-shutdown-crash.patch 
Log Message:
- Fix crash in text plugin on shutdown


fix-text-shutdown-crash.patch:
 ply-text-progress-bar.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE fix-text-shutdown-crash.patch ---
>From 9fd849e130db63ccca93d3c661751a13781bbbbf Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Thu, 1 Oct 2009 10:22:28 -0400
Subject: [PATCH] [text-progress-bar] Don't segfault if no os string

Some distributions won't have a release file that
we know about.  In those cases, we shouldn't crash.

This also sidesteps a crash on shutdown where we try to strlen the
os string, even though we don't load it or use it.
---
 src/libplybootsplash/ply-text-progress-bar.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/libplybootsplash/ply-text-progress-bar.c b/src/libplybootsplash/ply-text-progress-bar.c
index b7676c9..5e9baa2 100644
--- a/src/libplybootsplash/ply-text-progress-bar.c
+++ b/src/libplybootsplash/ply-text-progress-bar.c
@@ -57,7 +57,7 @@
 
 #define NUMBER_OF_INDICATOR_COLUMNS 6
 
-static char *os_string;
+static char *os_string = "";
 
 struct _ply_text_progress_bar
 {
-- 
1.6.5.rc2



Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/F-12/plymouth.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -p -r1.155 -r1.156
--- plymouth.spec	8 Oct 2009 21:59:38 -0000	1.155
+++ plymouth.spec	9 Oct 2009 14:02:17 -0000	1.156
@@ -6,7 +6,7 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.8.0
-Release: 0.2009.29.09.7%{?dist}
+Release: 0.2009.29.09.8%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -37,6 +37,7 @@ Patch3: fix-firstboot-on-radeon.patch
 Patch4: more-drm-fixes.patch
 Patch5: fix-emergency-shell.patch
 Patch6: fix-details-clear-screen.patch
+Patch7: fix-text-shutdown-crash.patch
 
 %description
 Plymouth provides an attractive graphical boot animation in
@@ -251,6 +252,7 @@ plugin.
 %patch4 -p1 -b .more-drm-fixes
 %patch5 -p1 -b .fix-emergency-shell
 %patch6 -p1 -b .fix-details-clear-screen
+%patch7 -p1 -b .fix-text-shutdown-crash
 
 %build
 %configure --enable-tracing --disable-tests --without-boot-entry \
@@ -468,6 +470,9 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* Fri Oct 09 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09.8
+- Fix crash in text plugin on shutdown
+
 * Thu Oct 08 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09.7
 - Fix emergency shell horkage (bug 526597)
 - Fix problem with details splash not showing up (bug 527426, bug 527254)