sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

apps/system: Call arg_freetable before iptables/tcpdump exit

Browse Source 
Forget to free argtable before exit.

Signed-off-by: Zhe Weng <wengzhe@xiaomi.com>
This commit is contained in:
Zhe Weng 2023-04-14 16:52:24 +08:00 committed by Xiang Xiao
parent 15df04083e
commit e935f153bc
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
system/iptables/iptables.c
View File

@ -407,6 +407,7 @@ int main(int argc, FAR char *argv[])
{ {
struct iptables_args_s args; struct iptables_args_s args;
int nerrors; int nerrors;
int ret = 0;
args.table = arg_str1("t", "table", "table", "table to manipulate"); args.table = arg_str1("t", "table", "table", "table to manipulate");
@ -440,20 +441,20 @@ int main(int argc, FAR char *argv[])
{ {
arg_print_errors(stderr, args.end, argv[0]); arg_print_errors(stderr, args.end, argv[0]);
iptables_showusage(argv[0], (FAR void**)&args); iptables_showusage(argv[0], (FAR void**)&args);
return 0;
} }
else if (strcmp(args.table->sval[0], TABLE_NAME_NAT) == 0)
if (strcmp(args.table->sval[0], TABLE_NAME_NAT) == 0)
{ {
int ret = iptables_nat(&args); ret = iptables_nat(&args);
if (ret < 0) if (ret < 0)
{ {
printf("iptables got error on NAT: %d!\n", ret); printf("iptables got error on NAT: %d!\n", ret);
} }
}
return ret; else
{
printf("Unknown table: %s\n", args.table->sval[0]);
} }
printf("Unknown table: %s\n", args.table->sval[0]); arg_freetable((FAR void **)&args, sizeof(args) / sizeof(FAR void *));
return 0; return ret;
} }

11
system/tcpdump/tcpdump.c
View File

@ -273,28 +273,28 @@ int main(int argc, FAR char *argv[])
arg_print_errors(stdout, args.end, argv[0]); arg_print_errors(stdout, args.end, argv[0]);
printf("Usage:\n"); printf("Usage:\n");
arg_print_glossary(stdout, (FAR void**)&args, " %-30s %s\n"); arg_print_glossary(stdout, (FAR void**)&args, " %-30s %s\n");
return 0; goto out;
} }
ifindex = if_nametoindex(args.interface->sval[0]); ifindex = if_nametoindex(args.interface->sval[0]);
if (ifindex == 0) if (ifindex == 0)
{ {
printf("Failed to get index of device %s\n", args.interface->sval[0]); printf("Failed to get index of device %s\n", args.interface->sval[0]);
return 0; goto out;
} }
cfgs.fd = open(args.file->sval[0], O_WRONLY | O_CREAT | O_TRUNC, 0644); cfgs.fd = open(args.file->sval[0], O_WRONLY | O_CREAT | O_TRUNC, 0644);
if (cfgs.fd < 0) if (cfgs.fd < 0)
{ {
perror("ERROR: open() failed"); perror("ERROR: open() failed");
return 0; goto out;
} }
cfgs.sd = socket_open(ifindex); cfgs.sd = socket_open(ifindex);
if (cfgs.sd < 0) if (cfgs.sd < 0)
{ {
close(cfgs.fd); close(cfgs.fd);
return 0; goto out;
} }
if (args.snaplen->count > 0) if (args.snaplen->count > 0)
@ -310,5 +310,8 @@ int main(int argc, FAR char *argv[])
close(cfgs.sd); close(cfgs.sd);
close(cfgs.fd); close(cfgs.fd);
out:
arg_freetable((FAR void **)&args, sizeof(args) / sizeof(FAR void *));
return 0; return 0;
} }