diff mbox

[dpdk-dev,v2] cmdline: check return value at initialization

Message ID 1463474217-30875-1-git-send-email-olivier.matz@6wind.com (mailing list archive)
State Accepted, archived
Delegated to: Thomas Monjalon
Headers

Commit Message

Olivier Matz May 17, 2016, 8:36 a.m. UTC 
  From: Marcin Kerlin <marcinx.kerlin@intel.com>

The value returned by rdline_init() was not checked in cmdline_new().
On error, free the allocated memory and return NULL.

This condition should not happen today, but it's safer to do the check
in case rdline_init() is updated.

Fixes: af75078fece3 ("first public release")
Coverity ID 13204

Signed-off-by: Marcin Kerlin <marcinx.kerlin@intel.com>
Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
---

Hi Marcin,

I updated the commit log and title to be clearer.

Regards,
Olivier


v1 -> v2
  rework title and commit log

 lib/librte_cmdline/cmdline.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

--
2.8.0.rc3

Comments

Thomas Monjalon May 19, 2016, 12:26 p.m. UTC | #1 
2016-05-17 10:36, Olivier Matz:
> From: Marcin Kerlin <marcinx.kerlin@intel.com>
> 
> The value returned by rdline_init() was not checked in cmdline_new().
> On error, free the allocated memory and return NULL.
> 
> This condition should not happen today, but it's safer to do the check
> in case rdline_init() is updated.
> 
> Fixes: af75078fece3 ("first public release")
> Coverity ID 13204
> 
> Signed-off-by: Marcin Kerlin <marcinx.kerlin@intel.com>
> Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
> ---
> 
> Hi Marcin,
> 
> I updated the commit log and title to be clearer.

Applied, thanks
diff mbox

Patch

diff --git a/lib/librte_cmdline/cmdline.c b/lib/librte_cmdline/cmdline.c
index c405878..a9c47be 100644
--- a/lib/librte_cmdline/cmdline.c
+++ b/lib/librte_cmdline/cmdline.c
@@ -130,6 +130,7 @@  struct cmdline *
 cmdline_new(cmdline_parse_ctx_t *ctx, const char *prompt, int s_in, int s_out)
 {
 	struct cmdline *cl;
+	int ret;
 
 	if (!ctx || !prompt)
 		return NULL;
@@ -142,8 +143,13 @@  cmdline_new(cmdline_parse_ctx_t *ctx, const char *prompt, int s_in, int s_out)
 	cl->s_out = s_out;
 	cl->ctx = ctx;
 
-	rdline_init(&cl->rdl, cmdline_write_char,
-		    cmdline_valid_buffer, cmdline_complete_buffer);
+	ret = rdline_init(&cl->rdl, cmdline_write_char, cmdline_valid_buffer,
+			cmdline_complete_buffer);
+	if (ret != 0) {
+		free(cl);
+		return NULL;
+	}
+
 	cl->rdl.opaque = cl;
 	cmdline_set_prompt(cl, prompt);
 	rdline_newline(&cl->rdl, cl->prompt);