From: Charlie Brej <cbrej@cs.man.ac.uk>
Date: Tue, 11 Aug 2009 14:37:47 +0000 (+0100)
Subject: [boot-splash] Allocate new string when concatenating
X-Git-Tag: 0.7.0~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00f250914bd4d5fef75affc305b2e04362a9040a;p=thirdparty%2Fplymouth.git

[boot-splash] Allocate new string when concatenating

Mallocs when concatenating command line arguments to a string.
Used in the testing code.
---

diff --git a/src/ply-boot-splash.c b/src/ply-boot-splash.c
index 8a0128e3..68bbaddc 100644
--- a/src/ply-boot-splash.c
+++ b/src/ply-boot-splash.c
@@ -519,15 +519,14 @@ main (int    argc,
   else
     theme_path = PLYMOUTH_THEME_PATH "/fade-in/fade-in.plymouth";
 
-  tty_name = strdup("tty");
-  if (argc > 2) {
-      strncat(tty_name, argv[2], strlen(argv[2]));
-  } else {
-      strncat(tty_name, "0", 1);
-  }
+  if (argc > 2)
+    asprintf(&tty_name, "tty%s", argv[2]);
+  else
+    tty_name = strdup("tty0");
 
   state.window = ply_window_new (tty_name);
   free(tty_name);
+  ply_window_attach_to_event_loop (state.window, state.loop);
 
   if (!ply_window_open (state.window))
     {