From 1825dbf8244b129665a69481c4537a57b9e03a8f Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Wed, 21 Feb 2024 16:07:05 +0200 Subject: [PATCH] Fix a memleak on invalid command line options The OS will clean it up yes, but in the meanwhile ASAN (when enabled) blew up on your face and scared you silly. Use the opportunity to add a test for a test on invalid option. --- lib/poptALL.c | 11 ++++++++--- tests/rpmgeneral.at | 9 ++++++++- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/lib/poptALL.c b/lib/poptALL.c index 69fd498..92266db 100644 --- a/lib/poptALL.c +++ b/lib/poptALL.c @@ -293,7 +293,7 @@ rpmcliFini(poptContext optCon) poptContext rpmcliInit(int argc, char *const argv[], struct poptOption * optionsTable) { - poptContext optCon; + poptContext optCon = NULL; int rc; const char *ctx, *execPath; @@ -331,14 +331,14 @@ rpmcliInit(int argc, char *const argv[], struct poptOption * optionsTable) while ((rc = poptGetNextOpt(optCon)) > 0) { fprintf(stderr, _("%s: option table misconfigured (%d)\n"), xgetprogname(), rc); - exit(EXIT_FAILURE); + goto err; } if (rc < -1) { fprintf(stderr, "%s: %s: %s\n", xgetprogname(), poptBadOption(optCon, POPT_BADOPTION_NOALIAS), poptStrerror(rc)); - exit(EXIT_FAILURE); + goto err; } /* Read rpm configuration (if not already read). */ @@ -350,4 +350,9 @@ rpmcliInit(int argc, char *const argv[], struct poptOption * optionsTable) } return optCon; + +err: + poptFreeContext(optCon); + exit(EXIT_FAILURE); + return NULL; /* not reached */ } diff --git a/tests/rpmgeneral.at b/tests/rpmgeneral.at index 4cfc7cd..e727b6a 100644 --- a/tests/rpmgeneral.at +++ b/tests/rpmgeneral.at @@ -26,7 +26,6 @@ AT_CHECK([runroot rpm --version],[0], ]) AT_CLEANUP - # ------------------------------ AT_SETUP([rpmbuild --version]) AT_KEYWORDS([basic]) @@ -35,6 +34,14 @@ AT_CHECK([runroot rpmbuild --version],[0], ]) AT_CLEANUP +AT_SETUP([rpm invalid option]) +AT_KEYWORDS([basic]) +AT_CHECK([runroot rpm --badopt], +[1], +[], +[rpm: --badopt: unknown option +]) +AT_CLEANUP # ------------------------------ AT_SETUP([rpm --showrc]) -- 2.33.0