]> git.ipfire.org Git - thirdparty/openvpn.git/commitdiff
Fix possible access of uninitialized pipe handles
authorSelva Nair <selva.nair@gmail.com>
Thu, 20 Feb 2020 01:56:43 +0000 (20:56 -0500)
committerDavid Sommerseth <davids@openvpn.net>
Thu, 20 Feb 2020 17:53:22 +0000 (18:53 +0100)
Compile time warning for openvpnserv.exe
interactive.c: In function ‘RunOpenvpn’:
interactive.c:160:27: warning: ‘svc_pipe’ may be used uninitialized in
this function [-Wmaybe-uninitialized]

When RunOpenvpn exits early due to errors, uninitialized svc_pipe and
ovpn_pipe vars could get passed to CloseHandleEx(). Fix by initializing
to NULL.

Signed-off-by: Selva Nair <selva.nair@gmail.com>
Acked-by: Lev Stipakov <lstipakov@gmail.com>
Message-Id: <1582163803-3342-1-git-send-email-selva.nair@gmail.com>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg19480.html
Signed-off-by: David Sommerseth <davids@openvpn.net>
src/openvpnserv/interactive.c

index 710f9c7ce7a3b19853c587c9bc1517adcf5a2ad8..8da49be6bd26fcebd73b48f80ac81a3c472a8f44 100644 (file)
@@ -1468,7 +1468,7 @@ static DWORD WINAPI
 RunOpenvpn(LPVOID p)
 {
     HANDLE pipe = p;
-    HANDLE ovpn_pipe, svc_pipe;
+    HANDLE ovpn_pipe = NULL, svc_pipe = NULL;
     PTOKEN_USER svc_user = NULL, ovpn_user = NULL;
     HANDLE svc_token = NULL, imp_token = NULL, pri_token = NULL;
     HANDLE stdin_read = NULL, stdin_write = NULL;