From: Romain Lievin <romain@rlievin.dyndns.org>
To: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Cc: Buddy Lucas <b.lucas@ohra.nl>, Roman Zippel <zippel@linux-m68k.org>
Subject: [PATCH] gconfig segfaults & compile error fix
Date: Mon, 5 Jan 2004 21:34:44 +0100 [thread overview]
Message-ID: <20040105203444.GA2201@rlievin.dyndns.org> (raw)
Hi,
this patch fix a segfault problem (Roman Zippel) as well as some compile warnings (Buddy Lucas).
Patch was against 2.6.0.
Thanks, Romain.
======================[ cut here ]=========================
diff -Naur linux-2.6.0/scripts/kconfig/gconf.c linux/scripts/kconfig/gconf.c
--- linux-2.6.0/scripts/kconfig/gconf.c 2003-12-18 03:59:41.000000000 +0100
+++ linux/scripts/kconfig/gconf.c 2003-12-24 15:31:06.000000000 +0100
@@ -1,7 +1,7 @@
/* Hey EMACS -*- linux-c -*- */
/*
*
- * Copyright (C) 2002-2003 Romain Lievin <roms@lpg.ticalc.org>
+ * Copyright (C) 2002-2003 Romain Lievin <roms@tilp.info>
* Released under the terms of the GNU GPL v2.0.
*
*/
@@ -1047,6 +1047,8 @@
return FALSE;
gtk_tree_model_get_iter(model2, &iter, path);
+ if(!gtk_tree_store_iter_is_valid(model2, &iter))
+ return FALSE;
gtk_tree_model_get(model2, &iter, COL_MENU, &menu, -1);
col = column2index(column);
@@ -1172,7 +1174,7 @@
gtk_widget_realize(tree2_w);
gtk_tree_view_set_cursor(view, path, NULL, FALSE);
- gtk_widget_grab_focus(GTK_TREE_VIEW(tree2_w));
+ gtk_widget_grab_focus(tree2_w);
return FALSE;
}
@@ -1401,7 +1403,6 @@
struct symbol *sym;
struct property *prop;
struct menu *menu1, *menu2;
- static GtkTreePath *path = NULL;
if (src == &rootmenu)
indent = 1;
@@ -1526,7 +1527,7 @@
if (((menu != &rootmenu) && !(menu->flags & MENU_ROOT)) ||
(view_mode == FULL_VIEW)
|| (view_mode == SPLIT_VIEW))*/
- if ((view_mode == SINGLE_VIEW) && (menu->flags & MENU_ROOT)
+ if (((view_mode == SINGLE_VIEW) && (menu->flags & MENU_ROOT))
|| (view_mode == FULL_VIEW) || (view_mode == SPLIT_VIEW)) {
indent++;
display_tree(child);
--
Romain Li�vin (roms): <roms@tilp.info>
Web site: http://tilp.info
"Linux, y'a moins bien mais c'est plus cher !"
reply other threads:[~2004-01-05 20:34 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20040105203444.GA2201@rlievin.dyndns.org \
--to=romain@rlievin.dyndns.org \
--cc=b.lucas@ohra.nl \
--cc=linux-kernel@vger.kernel.org \
--cc=zippel@linux-m68k.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
all inboxes | Powered by JetHome®