proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 11:25:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7047 from qlyoung/fix-zlog-target-null-deref

Browse Source 
lib: fix possible null dereference in zlog
This commit is contained in:
Mark Stapp 2020-09-08 15:25:08 -04:00 committed by GitHub
commit 000ce30ee5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/zlog_targets.c
View File

@ -225,10 +225,11 @@ static bool zlog_file_cycle(struct zlog_cfg_file *zcf)
zlt->zt.logfn_sigsafe = zlog_fd_sigsafe; zlt->zt.logfn_sigsafe = zlog_fd_sigsafe;
} while (0); } while (0);
old = zlog_target_replace(&zcf->active->zt, &zlt->zt); old = zlog_target_replace(zcf->active ? &zcf->active->zt : NULL,
zlt ? &zlt->zt : NULL);
zcf->active = zlt; zcf->active = zlt;
zlog_file_target_free(container_of(old, struct zlt_fd, zt)); zlog_file_target_free(container_of_null(old, struct zlt_fd, zt));
return rv; return rv;
} }