GitList

Browse code

Ensure input read using systemd-ask-password is null terminated

Also properly check the return value of read() and leave room
for termination.
Fixes junk data occasionally seen in strings read through systemd.

Signed-off-by: Selva Nair <selva.nair@gmail.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <1460606013-4983-1-git-send-email-selva.nair@gmail.com>
URL: http://article.gmane.org/gmane.network.openvpn.devel/11437
Signed-off-by: Gert Doering <gert@greenie.muc.de>

Selva Nair authored on 2016/04/14 12:53:33
Showing 1 changed files

src/openvpn/console.c index e1d46c4..86331a1 100644

src/openvpn/console.c

History View file @ d09fbf9

@@ -172,8 +172,9 @@ get_console_input_systemd (const char *prompt, const bool echo, char *input, con
                        if ((std_out = openvpn_popen (&argv, NULL)) < 0) {
                      	  return false;
+                       }
                     -  CLEAR (*input);
                     -  if (read (std_out, input, capacity) != 0)
+                    +
                     +  memset (input, 0, capacity);
                     +  if (read (std_out, input, capacity-1) > 0)
+                         {
                             chomp (input);
                             ret = true;