From: ohilyard@iol.unh.edu To: stable@dpdk.org Cc: christian.ehrhardt@canonical.com, Owen Hilyard <ohilyard@iol.unh.edu>, David Marchand <david.marchand@redhat.com> Subject: [dpdk-stable] [PATCH] tests/cmdline: fix memory leaks Date: Mon, 16 Aug 2021 08:05:13 -0400 Message-ID: <20210816120512.12224-1-ohilyard@iol.unh.edu> (raw) In-Reply-To: <CAATJJ0Lxjm8uaF1YWPk9ejW+U3=SLwWLwBx=7h2TUrGAjXORKg@mail.gmail.com> From: Owen Hilyard <ohilyard@iol.unh.edu> [ upstream commit ca7204b921c2f328ab1222772af40922970e7c4b ] Fixes for a few memory leaks in the cmdline_autotest unit test. All of the leaks were related to not freeing the commandline struct after testing had completed. Fixes: dbb860e03e ("cmdline: tests") Signed-off-by: Owen Hilyard <ohilyard@iol.unh.edu> Reviewed-by: David Marchand <david.marchand@redhat.com> --- app/test/test_cmdline_lib.c | 47 +++++++++++++++++++++++++++---------- 1 file changed, 34 insertions(+), 13 deletions(-) diff --git a/app/test/test_cmdline_lib.c b/app/test/test_cmdline_lib.c index a856a9713..7d9009408 100644 --- a/app/test/test_cmdline_lib.c +++ b/app/test/test_cmdline_lib.c @@ -62,10 +62,12 @@ test_cmdline_parse_fns(void) if (cmdline_complete(&cl, "buffer", &i, NULL, sizeof(dst)) >= 0) goto error; + cmdline_free(&cl); return 0; error: printf("Error: function accepted null parameter!\n"); + cmdline_free(&cl); return -1; } @@ -131,32 +133,43 @@ static int test_cmdline_socket_fns(void) { cmdline_parse_ctx_t ctx; + struct cmdline* cl; - if (cmdline_stdin_new(NULL, "prompt") != NULL) + cl = cmdline_stdin_new(NULL, "prompt"); + if (cl != NULL) goto error; - if (cmdline_stdin_new(&ctx, NULL) != NULL) + cl = cmdline_stdin_new(&ctx, NULL); + if (cl != NULL) goto error; - if (cmdline_file_new(NULL, "prompt", "/dev/null") != NULL) + cl = cmdline_file_new(NULL, "prompt", "/dev/null"); + if (cl != NULL) goto error; - if (cmdline_file_new(&ctx, NULL, "/dev/null") != NULL) + cl = cmdline_file_new(&ctx, NULL, "/dev/null"); + if (cl != NULL) goto error; - if (cmdline_file_new(&ctx, "prompt", NULL) != NULL) + cl = cmdline_file_new(&ctx, "prompt", NULL); + if (cl != NULL) goto error; - if (cmdline_file_new(&ctx, "prompt", "-/invalid/~/path") != NULL) { + cl = cmdline_file_new(&ctx, "prompt", "-/invalid/~/path"); + if (cl != NULL) { printf("Error: succeeded in opening invalid file for reading!"); + cmdline_free(cl); return -1; } - if (cmdline_file_new(&ctx, "prompt", "/dev/null") == NULL) { + cl = cmdline_file_new(&ctx, "prompt", "/dev/null"); + if (cl == NULL) { printf("Error: failed to open /dev/null for reading!"); + cmdline_free(cl); return -1; } /* void functions */ cmdline_stdin_exit(NULL); - + cmdline_free(cl); return 0; error: printf("Error: function accepted null parameter!\n"); + cmdline_free(cl); return -1; } @@ -164,16 +177,20 @@ static int test_cmdline_fns(void) { cmdline_parse_ctx_t ctx; - struct cmdline cl, *tmp; + struct cmdline cl, *tmp, *tmp2; memset(&ctx, 0, sizeof(ctx)); tmp = cmdline_new(&ctx, "test", -1, -1); - if (tmp == NULL) + if (tmp == NULL) { + tmp2 = NULL; goto error; + } - if (cmdline_new(NULL, "prompt", 0, 0) != NULL) + tmp2 = cmdline_new(NULL, "prompt", 0, 0); + if (tmp2 != NULL) goto error; - if (cmdline_new(&ctx, NULL, 0, 0) != NULL) + tmp2 = cmdline_new(&ctx, NULL, 0, 0); + if (tmp2 != NULL) goto error; if (cmdline_in(NULL, "buffer", CMDLINE_TEST_BUFSIZE) >= 0) goto error; @@ -202,14 +219,18 @@ test_cmdline_fns(void) if (memcmp(&cl, tmp, sizeof(cl))) goto mismatch; cmdline_free(tmp); - + cmdline_free(tmp2); return 0; error: printf("Error: function accepted null parameter!\n"); + cmdline_free(tmp); + cmdline_free(tmp2); return -1; mismatch: printf("Error: data changed!\n"); + cmdline_free(tmp); + cmdline_free(tmp2); return -1; } -- 2.30.2
next prev parent reply other threads:[~2021-08-16 12:05 UTC|newest] Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-08-10 17:39 [dpdk-stable] [PATCH 19.11] " ohilyard 2021-08-11 6:43 ` Christian Ehrhardt 2021-08-11 9:45 ` Christian Ehrhardt 2021-08-11 11:17 ` Christian Ehrhardt 2021-08-11 12:55 ` Owen Hilyard 2021-08-12 19:44 ` [dpdk-stable] [PATCH] " ohilyard 2021-08-16 8:59 ` Christian Ehrhardt 2021-08-16 12:05 ` ohilyard [this message] 2021-08-16 12:06 ` Owen Hilyard [not found] <20210616162553.350074-1-ohilyard@iol.unh.edu> 2021-06-16 18:07 ` ohilyard 2021-06-23 8:43 ` Olivier Matz
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210816120512.12224-1-ohilyard@iol.unh.edu \ --to=ohilyard@iol.unh.edu \ --cc=christian.ehrhardt@canonical.com \ --cc=david.marchand@redhat.com \ --cc=stable@dpdk.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
patches for DPDK stable branches This inbox may be cloned and mirrored by anyone: git clone --mirror https://inbox.dpdk.org/stable/0 stable/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 stable stable/ https://inbox.dpdk.org/stable \ stable@dpdk.org public-inbox-index stable Example config snippet for mirrors. Newsgroup available over NNTP: nntp://inbox.dpdk.org/inbox.dpdk.stable AGPL code for this site: git clone https://public-inbox.org/public-inbox.git