openwrt/luci
1
0
Fork 0
mirror of https://github.com/openwrt/luci.git synced 2026-04-15 19:01:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

luci-mod-status: fix luci-bwc segfault

Browse Source 
fixes: #8008

Signed-off-by: Andy Chiang <AndyChiang_git@outlook.com>
This commit is contained in:
Andy Chiang
2025-10-13 12:48:03 +07:00
committed by Paul Donald
parent 8d89aa1edb
commit a773103476
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
modules/luci-mod-status/src/luci-bwc.c
View File

@@ -442,8 +442,8 @@ static int run_daemon(void)
struct dirent *e;
struct stat s;
char *ipc;
char *ipc_command;
char *ipc = NULL;
char *ipc_command = NULL;
if(! stat("/proc/net/nf_conntrack", &s))
ipc = "/proc/net/nf_conntrack";
else if(! stat("/proc/net/ip_conntrack", &s))
@@ -541,8 +541,8 @@ static int run_daemon(void)
closedir(dir);
}
if (((ipc != '\0') && ((info = fopen(ipc, "r")) != NULL)) ||
((ipc_command != '\0') && ((info=popen(ipc_command, "r")) != NULL)))
if ((ipc && ((info = fopen(ipc, "r")) != NULL)) ||
(ipc_command && ((info = popen(ipc_command, "r")) != NULL)))
{
udp = 0;
tcp = 0;
@@ -570,7 +570,10 @@ static int run_daemon(void)
update_cnstat(udp, tcp, other);
fclose(info);
if (ipc)
fclose(info);
else
pclose(info);
}
if ((info = fopen("/proc/loadavg", "r")) != NULL)
@@ -582,10 +585,7 @@ static int run_daemon(void)
(uint16_t)(lf15 * 100));
}
if (ipc != '\0')
fclose(info);
if (ipc_command != '\0')
pclose(info);
fclose(info);
}
sleep(STEP_TIME);