From d911438352ebec5a887dac02ceb0bb99f54b34fc Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Sun, 14 Jan 2018 00:11:08 -0500 Subject: vercmp: fail when the wrong number of arguments are provided Fixes FS#49093 Signed-off-by: Eli Schwartz Signed-off-by: Allan McRae --- src/util/vercmp.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/util/vercmp.c b/src/util/vercmp.c index 0b5d4508..1b2f979e 100644 --- a/src/util/vercmp.c +++ b/src/util/vercmp.c @@ -40,8 +40,6 @@ static void usage(void) int main(int argc, char *argv[]) { - const char *s1 = ""; - const char *s2 = ""; int ret; if(argc == 1) { @@ -53,14 +51,13 @@ int main(int argc, char *argv[]) usage(); return 0; } - if(argc > 2) { - s2 = argv[2]; - } - if(argc > 1) { - s1 = argv[1]; + if(argc != 3) { + fprintf(stderr, "error: %d argument(s) specified\n\n" + "Usage: vercmp \n", argc - 1); + return EXIT_FAILURE; } - ret = alpm_pkg_vercmp(s1, s2); + ret = alpm_pkg_vercmp(argv[1], argv[2]); printf("%d\n", ret); return EXIT_SUCCESS; } -- cgit v1.2.3-70-g09d2