Merge pull request #14773 from LabNConsulting/fix-log-vty-memleak

lib: free the log file resources created at startup and config
This commit is contained in:
Donald Sharp 2023-11-11 18:25:04 -05:00 committed by GitHub
commit 34445653cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -857,12 +857,24 @@ void log_config_write(struct vty *vty)
} }
} }
static int log_vty_fini(void)
{
if (zt_file_cmdline.filename)
zlog_file_fini(&zt_file_cmdline);
if (zt_file.filename)
zlog_file_fini(&zt_file);
return 0;
}
static int log_vty_init(const char *progname, const char *protoname, static int log_vty_init(const char *progname, const char *protoname,
unsigned short instance, uid_t uid, gid_t gid) unsigned short instance, uid_t uid, gid_t gid)
{ {
zlog_progname = progname; zlog_progname = progname;
zlog_protoname = protoname; zlog_protoname = protoname;
hook_register(zlog_fini, log_vty_fini);
zlog_set_prefix_ec(true); zlog_set_prefix_ec(true);
zlog_set_prefix_xid(true); zlog_set_prefix_xid(true);