From cb4dd7730db546181916ca2510bea6d72a5f26dd Mon Sep 17 00:00:00 2001 From: Guillaume Nault Date: Fri, 11 Apr 2014 19:46:16 +0200 Subject: pppd compat: don't try to rename radattr files if RADIUS isn't used If accel-ppp is compiled with RADIUS support, but run without using it, then pd->tmp_fname is NULL. This patch verifies that pd->tmp_fname is valid before renaming the radattr file. Signed-off-by: Guillaume Nault --- accel-pppd/extra/pppd_compat.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/accel-pppd/extra/pppd_compat.c b/accel-pppd/extra/pppd_compat.c index 85fc02e8..7bdf5974 100644 --- a/accel-pppd/extra/pppd_compat.c +++ b/accel-pppd/extra/pppd_compat.c @@ -140,25 +140,24 @@ static void ev_ses_pre_up(struct ap_session *ses) if (!pd) return; - + #ifdef RADIUS - { - char *fname = _malloc(PATH_MAX); - if (!fname) { - log_emerg("pppd_compat: out of memory\n"); - return; - } - - sprintf(fname, "%s.%s", conf_radattr_prefix, ses->ifname); + if (pd->tmp_fname) { + char *fname = _malloc(PATH_MAX); - rename(pd->tmp_fname, fname); - - _free(fname); - _free(pd->tmp_fname); - pd->tmp_fname = NULL; + if (!fname) { + log_emerg("pppd_compat: out of memory\n"); + return; + } + + sprintf(fname, "%s.%s", conf_radattr_prefix, ses->ifname); + rename(pd->tmp_fname, fname); + + _free(fname); + _free(pd->tmp_fname); + pd->tmp_fname = NULL; } #endif - if (ses->ipv4) { pd->ipv4_addr = ses->ipv4->addr; -- cgit v1.2.3