[kdebase-workspace] Fix possible uninitialized variable use in ksplashx multi-screen code

[Than Ngo]

commit 96c919f59d185f37d66ca7a34789926ad96c45f5
Author: Than Ngo <than at redhat.com>
Date:   Mon Nov 7 12:15:53 2011 +0100

    Fix possible uninitialized variable use in ksplashx multi-screen code

 kde-workspace-4.7.3-ksplashx.patch |   12 ++++++++++++
 kdebase-workspace.spec             |    9 ++++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/kde-workspace-4.7.3-ksplashx.patch b/kde-workspace-4.7.3-ksplashx.patch
new file mode 100644
index 0000000..de4497c
--- /dev/null
+++ b/kde-workspace-4.7.3-ksplashx.patch
@@ -0,0 +1,12 @@
+diff -up kde-workspace-4.7.3/ksplash/ksplashx/main.cpp.orig kde-workspace-4.7.3/ksplash/ksplashx/main.cpp
+--- kde-workspace-4.7.3/ksplash/ksplashx/main.cpp.orig	2011-11-07 12:07:58.000000000 +0100
++++ kde-workspace-4.7.3/ksplash/ksplashx/main.cpp	2011-11-07 12:09:48.000000000 +0100
+@@ -90,7 +90,7 @@ int main( int argc, char* argv[] )
+                 screen_number = DefaultScreen(dpy);
+                 char* display_name;
+                 display_name = XDisplayString(dpy);
+-                int breakpos;
++                int breakpos = strlen(display_name);
+                 for (int i = strlen(display_name) - 1; i >= 0; i--)
+                     {
+                     if (display_name[i] == '.')
diff --git a/kdebase-workspace.spec b/kdebase-workspace.spec
index 8d77740..556a1ae 100644
--- a/kdebase-workspace.spec
+++ b/kdebase-workspace.spec
@@ -9,7 +9,7 @@
 Summary: KDE Workspace
 Name:    kdebase-workspace
 Version: 4.7.3
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 License: GPLv2
 Group:   User Interface/Desktops
@@ -86,6 +86,8 @@ Patch200: kdebase-workspace-4.5.85-no_HAL.patch
 Patch210: kdebase-workspace-4.5.90-no_HAL2.patch
 
 ## trunk patches
+# Fix possible uninitialized variable use in ksplashx multi-screen code
+Patch300: kde-workspace-4.7.3-ksplashx.patch
 
 # multilib fixed in 4.6.3-5, see https://bugzilla.redhat.com/704840
 Obsoletes: kdebase-workspace < 4.6.3-5 
@@ -358,6 +360,8 @@ Requires: akonadi
 %patch200 -p0 -b .no_HAL
 %patch210 -p1 -b .no_HAL2
 
+# trunk patches
+%patch300 -p1 -b .ksplashx
 
 %build
 
@@ -808,6 +812,9 @@ fi
 
 
 %changelog
+* Mon Nov 07 2011 Than Ngo <than at redhat.com> - 4.7.3-7
+- Fix possible uninitialized variable use in ksplashx multi-screen code
+
 * Fri Nov 04 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7.3-6
 - build against libkactivities-6.1