From: Jonathan K. Bullard <jkbullard@gmail.com>
Date: Sat, 23 May 2015 19:33:21 +0000 (-0400)
Subject: Fix null pointer dereference in options.c
X-Git-Tag: v2.3.7~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4bdcf450b66f8a8da2c030815097830494b55fc4;p=thirdparty%2Fopenvpn.git

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)
---

diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index 6341f7e19..fdf8fba47 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;