diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-14 02:56:27 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-14 02:56:27 +0200 |
| commit | 090b710e8a0b7fe6f4752c5a439261f955075ebc (patch) | |
| tree | c85856f2955c3b0795db2c30ef0b334c0614e326 /scripts/kconfig/nconf.c | |
| parent | Merge branch 'bkl/ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/fre... (diff) | |
| parent | kconfig: Fix warning: ignoring return value of 'fgets' (diff) | |
| download | linux-090b710e8a0b7fe6f4752c5a439261f955075ebc.tar.xz linux-090b710e8a0b7fe6f4752c5a439261f955075ebc.zip | |
Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
kconfig: Fix warning: ignoring return value of 'fgets'
kconfig: Fix warning: ignoring return value of 'fwrite'
nconfig: Fix segfault when menu is empty
kconfig: fix tristate choice with minimal config
kconfig: fix savedefconfig for tristate choices
Diffstat (limited to 'scripts/kconfig/nconf.c')
| -rw-r--r-- | scripts/kconfig/nconf.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c index 762caf80ce37..2ba71bcd38e6 100644 --- a/scripts/kconfig/nconf.c +++ b/scripts/kconfig/nconf.c @@ -676,6 +676,8 @@ static void *item_data(void) struct mitem *mcur; cur = current_item(curses_menu); + if (!cur) + return NULL; mcur = (struct mitem *) item_userptr(cur); return mcur->usrptr; |