From: ohilyard@iol.unh.edu
To: olivier.matz@6wind.com
Cc: dev@dpdk.org, stable@dpdk.org, david.marchand@redhat.com,
Owen Hilyard <ohilyard@iol.unh.edu>
Subject: [dpdk-dev] [PATCH v3] tests/cmdline: fix memory leaks
Date: Wed, 23 Jun 2021 14:06:45 -0400 [thread overview]
Message-ID: <20210623180645.91942-1-ohilyard@iol.unh.edu> (raw)
In-Reply-To: <20210616180724.355217-1-ohilyard@iol.unh.edu>
From: Owen Hilyard <ohilyard@iol.unh.edu>
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 | 40 ++++++++++++++++++++++++++-----------
1 file changed, 28 insertions(+), 12 deletions(-)
diff --git a/app/test/test_cmdline_lib.c b/app/test/test_cmdline_lib.c
index bd72df0da..b476b2594 100644
--- a/app/test/test_cmdline_lib.c
+++ b/app/test/test_cmdline_lib.c
@@ -71,10 +71,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;
}
@@ -140,32 +142,44 @@ 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;
}
@@ -176,13 +190,14 @@ test_cmdline_fns(void)
struct cmdline *cl;
memset(&ctx, 0, sizeof(ctx));
- cl = cmdline_new(&ctx, "test", -1, -1);
- if (cl == NULL)
+ cl = cmdline_new(NULL, "prompt", 0, 0);
+ if (cl != NULL)
goto error;
-
- if (cmdline_new(NULL, "prompt", 0, 0) != NULL)
+ cl = cmdline_new(&ctx, NULL, 0, 0);
+ if (cl != NULL)
goto error;
- if (cmdline_new(&ctx, NULL, 0, 0) != NULL)
+ cl = cmdline_new(&ctx, "test", -1, -1);
+ if (cl == NULL)
goto error;
if (cmdline_in(NULL, "buffer", CMDLINE_TEST_BUFSIZE) >= 0)
goto error;
@@ -198,6 +213,7 @@ test_cmdline_fns(void)
cmdline_interact(NULL);
cmdline_quit(NULL);
+ cmdline_free(cl);
return 0;
error:
--
2.30.2
next prev parent reply other threads:[~2021-06-23 18:06 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-16 16:25 [dpdk-dev] [PATCH] " ohilyard
2021-06-16 16:48 ` David Marchand
2021-06-16 18:07 ` ohilyard
2021-06-23 8:43 ` Olivier Matz
2021-06-23 18:06 ` ohilyard [this message]
2021-06-24 12:07 ` [dpdk-dev] [PATCH v3] " Olivier Matz
2021-06-24 13:24 ` David Marchand
2021-06-24 13:25 ` David Marchand
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=20210623180645.91942-1-ohilyard@iol.unh.edu \
--to=ohilyard@iol.unh.edu \
--cc=david.marchand@redhat.com \
--cc=dev@dpdk.org \
--cc=olivier.matz@6wind.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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).