From 64d66b30131dfab87dda2071ecaec363feaafc58 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Wed, 13 Dec 2017 17:35:29 -0500 Subject: [pacman-dev] [PATCH] vercmp: fail when the wrong number of arguments are provided Fixes FS#49093 Signed-off-by: Eli Schwartz --- src/util/vercmp.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/util/vercmp.c b/src/util/vercmp.c index 3521a96a..7b34b30a 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) { @@ -54,14 +52,12 @@ int main(int argc, char *argv[]) usage(); return 0; } - if(argc > 2) { - s2 = argv[2]; - } - if(argc > 1) { - s1 = argv[1]; + if(argc != 3) { + printf("error: %d arguments specified but vercmp needs 2\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; } -- 2.15.1