Call malloc() just once to allocate needed memory.
Signed-off-by: Masahiro Yamada <masahiroy@xxxxxxxxxx>
---
scripts/kconfig/expr.h | 2 +-
scripts/kconfig/util.c | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h
index 85e0d1ab3c8a..760b1e681b43 100644
--- a/scripts/kconfig/expr.h
+++ b/scripts/kconfig/expr.h
@@ -19,7 +19,7 @@ extern "C" {
struct file {
struct file *next;
- const char *name;
+ char name[];
};
typedef enum tristate {
diff --git a/scripts/kconfig/util.c b/scripts/kconfig/util.c
index 958543bb0a37..2636dccea0c9 100644
--- a/scripts/kconfig/util.c
+++ b/scripts/kconfig/util.c
@@ -13,6 +13,7 @@
struct file *file_lookup(const char *name)
{
struct file *file;
+ size_t len;
for (file = file_list; file; file = file->next) {
if (!strcmp(name, file->name)) {
@@ -20,9 +21,11 @@ struct file *file_lookup(const char *name)
}
}
- file = xmalloc(sizeof(*file));
+ len = strlen(name);
+ file = xmalloc(sizeof(*file) + len + 1);
memset(file, 0, sizeof(*file));
- file->name = xstrdup(name);
+ memcpy(file->name, name, len);
+ file->name[len] = '\0';
file->next = file_list;
file_list = file;
--
2.40.1
