alaurie/plymouth
1
0
Fork 0
forked from rpms/plymouth
Code Pull Requests Activity

- Fix another crasher for users with encrypted disks (this time in the text

Browse Source 
plugin, not the client)
This commit is contained in:
Ray Strode 2008-08-27 18:13:23 +00:00
parent 1f694394eb
commit 5f8ef1d59f
2 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
fix-text-plugin-crasher.patch Normal file
View File

@ -0,0 +1,30 @@
commit 5534d814aac9a7e7d975670653fc7f89701cff68
Author: Ray Strode <rstrode@redhat.com>
Date: Wed Aug 27 14:08:12 2008 -0400
Don't try to print prompt in text plugin, if there is not prompt
Fixes a crasher.
diff --git a/src/plugins/splash/text/plugin.c b/src/plugins/splash/text/plugin.c
index 8800122..11c2dc4 100644
--- a/src/plugins/splash/text/plugin.c
+++ b/src/plugins/splash/text/plugin.c
@@ -294,10 +294,13 @@ ask_for_password (ply_boot_splash_plugin_t *plugin,
window_width = ply_window_get_number_of_text_columns (plugin->window);
window_height = ply_window_get_number_of_text_rows (plugin->window);
- ply_window_set_text_cursor_position (plugin->window,
- window_width / 2 - strlen (prompt) / 2,
- window_height / 2 - 1);
- write (STDOUT_FILENO, prompt, strlen (prompt));
+ if (prompt != NULL)
+ {
+ ply_window_set_text_cursor_position (plugin->window,
+ window_width / 2 - strlen (prompt) / 2,
+ window_height / 2 - 1);
+ write (STDOUT_FILENO, prompt, strlen (prompt));
+ }
ply_window_set_text_cursor_position (plugin->window,
window_width / 2 - strlen ("Password: "),
window_height / 2);

10
plymouth.spec
View File

@ -1,7 +1,7 @@
Summary: Plymouth Graphical Boot Animation and Logger
Name: plymouth
Version: 0.6.0
Release: 0.2008.08.27%{?dist}
Release: 0.2008.08.27.1%{?dist}
License: GPLv2+
Group: System Environment/Base
Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@ -9,6 +9,7 @@ URL: http://freedesktop.org/software/plymouth/releases
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0: plymouth-0.5.0-textbar-hotness.patch
Patch1: fix-text-plugin-crasher.patch
Obsoletes: rhgb < 1:10.0.0
Provides: rhgb = 1:10.0.0
@ -106,6 +107,7 @@ spins in the shape of an infinity sign.
%prep
%setup -q
%patch0 -p1 -b .textbar
%patch1 -p1 -b .fix-text-plugin-crasher
%build
%configure --enable-tracing --disable-tests --without-boot-entry \
@ -226,7 +228,11 @@ fi
%{_libdir}/plymouth/spinfinity.so
%changelog
* Wed Aug 27 2008 Ray Strode <rstrode@redhat.com> 0.5.0-0.2008.08.28
* Wed Aug 27 2008 Ray Strode <rstrode@redhat.com> 0.5.0-0.2008.08.27.1
- Fix another crasher for users with encrypted disks (this time in
the text plugin, not the client)
* Wed Aug 27 2008 Ray Strode <rstrode@redhat.com> 0.5.0-0.2008.08.27
- Update to latest snapshot
- Add the ability to show text prompts in graphical plugin
- Fix crasher for users with encrypted disks