From da526699956100539031b3f182cd26eb69538ff3 Mon Sep 17 00:00:00 2001 From: z3APA3A <3APA3A@3proxy.ru> Date: Mon, 7 Dec 2015 19:06:16 +0300 Subject: [PATCH] NULL pointer dereference fixed in configuration load introduced with latest commits --- src/proxymain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/proxymain.c b/src/proxymain.c index 27a64ae..a1544e0 100644 --- a/src/proxymain.c +++ b/src/proxymain.c @@ -659,7 +659,7 @@ void srvinit(struct srvparam * srv, struct clientparam *param){ srv->version = conf.paused; srv->logfunc = conf.logfunc; if(srv->logformat)myfree(srv->logformat); - srv->logformat = mystrdup(conf.logformat); + srv->logformat = conf.logformat? mystrdup(conf.logformat) : NULL; srv->authfunc = conf.authfunc; srv->usentlm = 0; srv->maxchild = conf.maxchild;