]> git.ipfire.org Git - thirdparty/plymouth.git/commitdiff
[boot-splash] Allocate new string when concatenating
authorCharlie Brej <cbrej@cs.man.ac.uk>
Tue, 11 Aug 2009 14:37:47 +0000 (15:37 +0100)
committerCharlie Brej <cbrej@cs.man.ac.uk>
Tue, 11 Aug 2009 14:37:47 +0000 (15:37 +0100)
Mallocs when concatenating command line arguments to a string.
Used in the testing code.

src/ply-boot-splash.c

index 8a0128e3cbf629abf6093608d77c12fad4985dc9..68bbaddc6028fb1e3b9ecfe4622adca0fdcdb811 100644 (file)
@@ -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))
     {