qemu-trivial.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Pavel Borzenkov <pavel.borzenkov@gmail.com>
To: qemu-devel@nongnu.org
Cc: qemu-trivial@nongnu.org
Subject: [Qemu-trivial] [PATCH] cmd: Fix potential NULL pointer dereference
Date: Sat, 29 Oct 2011 01:48:53 +0400	[thread overview]
Message-ID: <1319838533-25405-1-git-send-email-pavel.borzenkov@gmail.com> (raw)

Signed-off-by: Pavel Borzenkov <pavel.borzenkov@gmail.com>
---
Note, that almost all code in the file violates CODING STYLE. The changed lines
are written wrt CODING STYLE (like commits 7d7d975c and c32d766a).
---

 cmd.c |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/cmd.c b/cmd.c
index f77897e..abcf206 100644
--- a/cmd.c
+++ b/cmd.c
@@ -49,7 +49,7 @@ void
 add_command(
 	const cmdinfo_t	*ci)
 {
-	cmdtab = realloc((void *)cmdtab, ++ncmds * sizeof(*cmdtab));
+    cmdtab = g_realloc((void *)cmdtab, ++ncmds * sizeof(*cmdtab));
 	cmdtab[ncmds - 1] = *ci;
 	qsort(cmdtab, ncmds, sizeof(*cmdtab), compare);
 }
@@ -125,12 +125,7 @@ find_command(
 void
 add_user_command(char *optarg)
 {
-	ncmdline++;
-	cmdline = realloc(cmdline, sizeof(char*) * (ncmdline));
-	if (!cmdline) {
-		perror("realloc");
-		exit(1);
-	}
+    cmdline = g_realloc(cmdline, ++ncmdline * sizeof(char *));
 	cmdline[ncmdline-1] = optarg;
 }
 
@@ -194,7 +189,7 @@ command_loop(void)
 		doneline(input, v);
 	}
 	if (cmdline) {
-		free(cmdline);
+        g_free(cmdline);
 		return;
 	}
 
-- 
1.7.0.4



             reply	other threads:[~2011-10-28 21:49 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-28 21:48 Pavel Borzenkov [this message]
2011-10-31  6:27 ` [Qemu-trivial] [Qemu-devel] [PATCH] cmd: Fix potential NULL pointer dereference Markus Armbruster
2011-10-31  7:18   ` Pavel Borzenkov

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=1319838533-25405-1-git-send-email-pavel.borzenkov@gmail.com \
    --to=pavel.borzenkov@gmail.com \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-trivial@nongnu.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).