[Openvpn-devel] ssl_common.h: fix "not all control paths return a value" msvc warning

Message ID 20201217224834.160-1-lstipakov@gmail.com
State Accepted
Headers show
Series [Openvpn-devel] ssl_common.h: fix "not all control paths return a value" msvc warning | expand

Commit Message

Lev Stipakov Dec. 17, 2020, 11:48 a.m. UTC
From: Lev Stipakov <lev@openvpn.net>

Commit cc5a71637 ("Replace key_scan array of static pointers with inline function")
has introduced get_key_scan() routine with switch statement which calls ASSERT
in certain case. Even though "this should never happen", this code triggers Level 1
warning "not all control paths return a value" in msvc.

Fix by adding "return NULL; /* NOTREACHED */"" after ASSERT.

Signed-off-by: Lev Stipakov <lev@openvpn.net>
 src/openvpn/ssl_common.h | 1 +
 1 file changed, 1 insertion(+)


Gert Doering Dec. 20, 2020, 9:39 a.m. UTC | #1
Acked-by: Gert Doering <gert@greenie.muc.de>

Your patch has been applied to the master branch.

commit 86d7e9902db7fcbbbc31aaa5b69bee82375caa21
Author: Lev Stipakov
Date:   Fri Dec 18 00:48:34 2020 +0200

     ssl_common.h: fix 'not all control paths return a value' msvc warning

     Signed-off-by: Lev Stipakov <lev@openvpn.net>
     Acked-by: Gert Doering <gert@greenie.muc.de>
     Message-Id: <20201217224834.160-1-lstipakov@gmail.com>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg21373.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>

kind regards,

Gert Doering


diff --git a/src/openvpn/ssl_common.h b/src/openvpn/ssl_common.h
index f435089a..a826e37f 100644
--- a/src/openvpn/ssl_common.h
+++ b/src/openvpn/ssl_common.h
@@ -596,6 +596,7 @@  get_key_scan(struct tls_multi *multi, int index)
             return &multi->session[TM_LAME_DUCK].key[KS_LAME_DUCK];
+            return NULL; /* NOTREACHED */