]> git.ipfire.org Git - thirdparty/openvpn.git/commitdiff
Fix null pointer dereference in options.c
authorJonathan K. Bullard <jkbullard@gmail.com>
Sat, 23 May 2015 19:33:21 +0000 (15:33 -0400)
committerGert Doering <gert@greenie.muc.de>
Sat, 23 May 2015 20:27:42 +0000 (22:27 +0200)
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)

src/openvpn/options.c

index 6341f7e19d6e880c8e37211f880137b416a1baee..fdf8fba47e644252f1dcd3566c78596fd2dc4f9e 100644 (file)
@@ -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;