From 081f4c843cea1179fbac7c1873bda4c4ef170b95 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Wed, 16 Jun 2021 17:38:21 +0200 Subject: [PATCH] Return immediately on error and after successful run This patch prevents accidental poking in argv[] beyond what we've gotten arguments for. Signed-off-by: Joachim Wiberg --- src/mvls/mvls.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/mvls/mvls.c b/src/mvls/mvls.c index 71eca39..f2a4010 100644 --- a/src/mvls/mvls.c +++ b/src/mvls/mvls.c @@ -749,6 +749,7 @@ int main(int argc, char **argv) env_show_vtu(&env); puts(""); env_show_atu(&env); puts(""); env_show_ports(&env); + return 0; } if (!strcmp(argv[1], "port")) @@ -761,13 +762,17 @@ int main(int argc, char **argv) struct dev *dev; int index; - if (argc == 2) + if (argc == 2) { env_show_pvt(&env); + return 0; + } index = strtol(argv[2], NULL, 0); dev = env_dev_get(&env, index); - if (!dev) + if (!dev) { fprintf(stderr, "ERROR: Unknown device index \"%s\".\n", argv[2]); + return 1; + } dev_show_pvt(dev); }