diff --git a/[refs] b/[refs] index b34e2818bb9a..2b7c37de44b6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 063f4661fde8c03c4c03f8a205071a52691c152e +refs/heads/master: e983b7b17ad1a978e954e6aaa62cf12bfc747883 diff --git a/trunk/scripts/kconfig/menu.c b/trunk/scripts/kconfig/menu.c index b5c7d90df9df..fd3f0180e08f 100644 --- a/trunk/scripts/kconfig/menu.c +++ b/trunk/scripts/kconfig/menu.c @@ -146,11 +146,24 @@ struct property *menu_add_prop(enum prop_type type, char *prompt, struct expr *e struct menu *menu = current_entry; while ((menu = menu->parent) != NULL) { + struct expr *dup_expr; + if (!menu->visibility) continue; + /* + * Do not add a reference to the + * menu's visibility expression but + * use a copy of it. Otherwise the + * expression reduction functions + * will modify expressions that have + * multiple references which can + * cause unwanted side effects. + */ + dup_expr = expr_copy(menu->visibility); + prop->visible.expr = expr_alloc_and(prop->visible.expr, - menu->visibility); + dup_expr); } }