summaryrefslogtreecommitdiffstats
path: root/src/openvpn/options.c
diff options
context:
space:
mode:
authorJonathan K. Bullard <jkbullard@gmail.com>2015-05-23 15:33:21 -0400
committerGert Doering <gert@greenie.muc.de>2015-05-23 22:27:42 +0200
commit4bdcf450b66f8a8da2c030815097830494b55fc4 (patch)
tree9d78fb96949dbb9bac896f163ff3dd9f320a0840 /src/openvpn/options.c
parentae9aff25c5a74e770a29a3a675f5b8f8dd8c5bf8 (diff)
downloadopenvpn-4bdcf450b66f8a8da2c030815097830494b55fc4.tar.gz
openvpn-4bdcf450b66f8a8da2c030815097830494b55fc4.tar.xz
openvpn-4bdcf450b66f8a8da2c030815097830494b55fc4.zip
Fix null pointer dereference in options.c
Acked-by: Gert Doering <gert@greenie.muc.de> Message-Id: <CAEsd45SHoEtahdVT95a+N-zmjRG4nH3QPxBZoGpnh1pykjSU4A@mail.gmail.com> URL: http://article.gmane.org/gmane.network.openvpn.devel/9723 Signed-off-by: Gert Doering <gert@greenie.muc.de> (cherry picked from commit 025d611fc68aa0c651c391bd6178d062246f36f0)
Diffstat (limited to 'src/openvpn/options.c')
-rw-r--r--src/openvpn/options.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index 6341f7e..fdf8fba 100644
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -7059,7 +7059,7 @@ add_option (struct options *options,
options->persist_config = true;
options->persist_mode = 1;
}
- else if (streq (p[0], "peer-id"))
+ else if (streq (p[0], "peer-id") && p[1])
{
VERIFY_PERMISSION (OPT_P_PEER_ID);
options->use_peer_id = true;