From: Charlie Brej <cbrej@cs.man.ac.uk>
Date: Wed, 21 Jul 2010 14:54:36 +0000 (+0100)
Subject: [main] only look for a shell in valid returned prefixed strings
X-Git-Tag: 0.8.4~180
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91fada481807f1437ec71c8e7adccd66aa0b47aa;p=thirdparty%2Fplymouth.git

[main] only look for a shell in valid returned prefixed strings

Fixes a segfault if no "init=" is present
---

diff --git a/src/main.c b/src/main.c
index 7ab763bc..69a87455 100644
--- a/src/main.c
+++ b/src/main.c
@@ -656,9 +656,12 @@ plymouth_should_ignore_show_splash_calls (state_t *state)
 
   init_string = command_line_get_string_after_prefix (state->kernel_command_line, "init=");
 
-  length = strcspn (init_string, " \n");
-  if (length > 2 && ply_string_has_prefix (init_string + length - 2, "sh"))
-    return true;
+  if (init_string)
+    {
+      length = strcspn (init_string, " \n");
+      if (length > 2 && ply_string_has_prefix (init_string + length - 2, "sh"))
+	return true;
+    }
 
   return false;
 }