linux-kernel - Re: [PATCH 4/6] gconfig: fix null pointer warning

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20100427133658.64e25ab5.rdunlap@xenotime.net>
Date:	Tue, 27 Apr 2010 13:36:58 -0700
From:	Randy Dunlap <rdunlap@...otime.net>
To:	Li Zefan <lizf@...fujitsu.com>
Cc:	Michal Marek <mmarek@...e.cz>,
	Randy Dunlap <randy.dunlap@...cle.com>,
	Andrew Morton <akpm@...ux-foundation.org>,
	LKML <linux-kernel@...r.kernel.org>, linux-kbuild@...r.kernel.org
Subject: Re: [PATCH 4/6] gconfig: fix null pointer warning

On Tue, 27 Apr 2010 15:49:00 +0800 Li Zefan wrote:

> In gconfig if you enable "Show all options", you'll see some "(null)"
> config options, and clicking those options triggers a warning:
> 
> (gconf:9368): Gtk-CRITICAL **: gtk_text_buffer_insert_with_tags: assertion `text != NULL' failed
> 
> Signed-off-by: Li Zefan <lizf@...fujitsu.com>

Acked-by: Randy Dunlap <randy.dunlap@...cle.com>

> ---
>  scripts/kconfig/gconf.c |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c
> index 1b18329..d669882 100644
> --- a/scripts/kconfig/gconf.c
> +++ b/scripts/kconfig/gconf.c
> @@ -1343,7 +1343,8 @@ static void update_tree(struct menu *src, GtkTreeIter * dst)
>  #endif
>  
>  		if ((opt_mode == OPT_NORMAL && !menu_is_visible(child1)) ||
> -		    (opt_mode == OPT_PROMPT && !menu_has_prompt(child1))) {
> +		    (opt_mode == OPT_PROMPT && !menu_has_prompt(child1)) ||
> +		    (opt_mode == OPT_ALL    && !menu_get_prompt(child1))) {
>  
>  			/* remove node */
>  			if (gtktree_iter_find_node(dst, menu1) != NULL) {
> @@ -1425,7 +1426,7 @@ static void display_tree(struct menu *menu)
>  
>  		if ((opt_mode == OPT_NORMAL && menu_is_visible(child)) ||
>  		    (opt_mode == OPT_PROMPT && menu_has_prompt(child)) ||
> -		    (opt_mode == OPT_ALL))
> +		    (opt_mode == OPT_ALL    && menu_get_prompt(child)))
>  			place_node(child, fill_row(child));
>  #ifdef DEBUG
>  		printf("%*c%s: ", indent, ' ', menu_get_prompt(child));
> -- 


---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/