GitList

Browse code

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)

Jonathan K. Bullard authored on 2015/05/24 04:33:21
Showing 1 changed files

src/openvpn/options.c index 6341f7e..fdf8fba 100644

src/openvpn/options.c

History View file @ 4bdcf45

@@ -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;

...	...	@@ -7059,7 +7059,7 @@ add_option (struct options *options,
7059	7059	options->persist_config = true;
7060	7060	options->persist_mode = 1;
7061	7061	}
7062		- else if (streq (p[0], "peer-id"))
	7062	+ else if (streq (p[0], "peer-id") && p[1])
7063	7063	{
7064	7064	VERIFY_PERMISSION (OPT_P_PEER_ID);
7065	7065	options->use_peer_id = true;