]> 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)
committerGert Doering <gert@greenie.muc.de>
Wed, 15 Apr 2020 17:42:14 +0000 (19:42 +0200)
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>
(cherry picked from commit 32723d29b2775d63d3fe329d017e7a08e0cdcb72)

src/openvpnserv/interactive.c

index a2b3b2019f96371509aaf587aa8d2eb0ef457752..aecbd842a9e3bf6b0dd77d7d8eeed819da3278ef 100644 (file)
@@ -1349,7 +1349,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;