From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 7/9] menu: fix memory corruption
Date: Mon, 23 Aug 2010 08:24:11 +0200 [thread overview]
Message-ID: <1282544653-11508-8-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1282544653-11508-1-git-send-email-s.hauer@pengutronix.de>
menu_free and menu_entry_free are called on not fully initialized
entries, so we have to check for validity before freeing the
members.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
| 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
--git a/common/menu.c b/common/menu.c
index 6e6637a..294e372 100644
--- a/common/menu.c
+++ b/common/menu.c
@@ -46,8 +46,10 @@ void menu_free(struct menu *m)
if (!m)
return;
- free(m->name);
- free(m->display);
+ if (m->name)
+ free(m->name);
+ if (m->display)
+ free(m->display);
list_for_each_entry_safe(me, tmp, &m->entries, list)
menu_entry_free(me);
@@ -143,7 +145,9 @@ void menu_entry_free(struct menu_entry *me)
if (!me)
return;
- free(me->display);
+ if (me->display)
+ free(me->display);
+
free(me);
}
--
1.7.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2010-08-23 6:24 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-23 6:24 Update patches for menu framework Sascha Hauer
2010-08-23 6:24 ` [PATCH 1/9] menu: initialize entries list in menu_alloc Sascha Hauer
2010-08-23 6:24 ` [PATCH 2/9] menu: Use strdup instead of malloc/strncpy Sascha Hauer
2010-08-23 6:24 ` [PATCH 3/9] menu: simplify menu_free with list_for_each_entry_safe Sascha Hauer
2010-08-23 6:24 ` [PATCH 4/9] menu: remove superfluous struct menu_entry member from struct menu Sascha Hauer
2010-08-23 6:24 ` [PATCH 5/9] menu: use list_for_each_entry where appropriate Sascha Hauer
2010-08-23 6:24 ` [PATCH 6/9] menu: use an initialized struct list as menu list Sascha Hauer
2010-08-23 6:24 ` Sascha Hauer [this message]
2010-08-23 11:40 ` [PATCH 7/9] menu: fix memory corruption Jean-Christophe PLAGNIOL-VILLARD
2010-08-23 12:44 ` Uwe Kleine-König
2010-08-23 6:24 ` [PATCH 8/9] menu: do not go to free if there's nothing to free Sascha Hauer
2010-08-23 6:24 ` [PATCH 9/9] menu: simplify usage for clients Sascha Hauer
2010-08-23 15:18 ` Jean-Christophe PLAGNIOL-VILLARD
2010-08-23 16:49 ` Sascha Hauer
2010-08-26 16:19 ` Jean-Christophe PLAGNIOL-VILLARD
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=1282544653-11508-8-git-send-email-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.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