Skip to contentSkip to conversation

kconfig: Fix compiler warning

PATCH In review Eddie Kovsky 2 participants 2 messages Nov 20, 2014 – Nov 28, 2014

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kconfig: Fix compiler warning

Fixes gcc warning when building linux-next:

In file included from scripts/kconfig/zconf.tab.c:2537:0:
scripts/kconfig/menu.c: In function ‘get_symbol_str’:
scripts/kconfig/menu.c:590:18: warning: ‘jump’ may be used uninitialized in this function [-Wmaybe-uninitialized]

     jump->offset = strlen(r->s);
                  ^
scripts/kconfig/menu.c:551:19: note: ‘jump’ was declared here
  struct jump_key *jump;
                   ^

HOSTLD scripts/kconfig/conf

Moved the initialization of struct jump_key *jump outside the first 'if' branch so it can be available throughout the function.

Also uses the preferred pointer syntax for passing the size of a struct.

Tested on next-20141119.

---
 scripts/kconfig/menu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/kconfig/menu.c +1 -1
index a26cc5d2a9b0..a728d23949e7 100644
@@ -559,8 +559,8 @@ static void get_prompt_str(struct gstr *r, struct property *prop,
 		if (location == NULL && accessible)
 			location = menu;
 	}
+	jump = xmalloc(sizeof(*jump));
 	if (head && location) {
-		jump = xmalloc(sizeof(struct jump_key));
 
 		if (menu_is_visible(prop->menu)) {
 			/*
Signature · 1 line
2.1.0
#1 lore raw

scripts/kconfig/menu.c static void get_prompt_str(struct gstr *r, struct property *prop, · line 563

Quoted 11 lines · Eddie Kovsky
scripts/kconfig/menu.c +1 -1
index a26cc5d2a9b0..a728d23949e7 100644
@@ -559,8 +559,8 @@ static void get_prompt_str(struct gstr *r, struct property *prop,
 		if (location == NULL && accessible)
 			location = menu;
 	}
+	jump = xmalloc(sizeof(*jump));
 	if (head && location) {
-		jump = xmalloc(sizeof(struct jump_key));

This creates a memory leak, because 'jump' is allocated, but not added to the list, if the following condition is not met.

Michal