diff options
author | Marcin Garski <mgarski@post.pl> | 2007-05-05 16:49:00 -0400 |
---|---|---|
committer | Sam Ravnborg <sam@ravnborg.org> | 2007-05-06 03:27:15 -0400 |
commit | 11de39e2fbbc592018e0a231d0ee773653dcc8d6 (patch) | |
tree | b924f942d4bb696669dbd572c4708a173953dec7 | |
parent | 767e581d759fe6adfef5e676cd1cd8e11f603d1a (diff) |
kconfig: fix mconf segmentation fault
I have found small bug in mconf, when you run it without any argument it
will sigsegv.
Without patch:
$ scripts/kconfig/mconf
Segmentation fault
With patch:
$ scripts/kconfig/mconf
can't find file (null)
Signed-off-by: Marcin Garski <mgarski@post.pl>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
-rw-r--r-- | scripts/kconfig/lex.zconf.c_shipped | 2 | ||||
-rw-r--r-- | scripts/kconfig/zconf.l | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/kconfig/lex.zconf.c_shipped b/scripts/kconfig/lex.zconf.c_shipped index 800f8c71c407..0fdc9049296f 100644 --- a/scripts/kconfig/lex.zconf.c_shipped +++ b/scripts/kconfig/lex.zconf.c_shipped | |||
@@ -2264,7 +2264,7 @@ FILE *zconf_fopen(const char *name) | |||
2264 | FILE *f; | 2264 | FILE *f; |
2265 | 2265 | ||
2266 | f = fopen(name, "r"); | 2266 | f = fopen(name, "r"); |
2267 | if (!f && name[0] != '/') { | 2267 | if (!f && name != NULL && name[0] != '/') { |
2268 | env = getenv(SRCTREE); | 2268 | env = getenv(SRCTREE); |
2269 | if (env) { | 2269 | if (env) { |
2270 | sprintf(fullname, "%s/%s", env, name); | 2270 | sprintf(fullname, "%s/%s", env, name); |
diff --git a/scripts/kconfig/zconf.l b/scripts/kconfig/zconf.l index cfa46077c6b4..187d38ccadd5 100644 --- a/scripts/kconfig/zconf.l +++ b/scripts/kconfig/zconf.l | |||
@@ -265,7 +265,7 @@ FILE *zconf_fopen(const char *name) | |||
265 | FILE *f; | 265 | FILE *f; |
266 | 266 | ||
267 | f = fopen(name, "r"); | 267 | f = fopen(name, "r"); |
268 | if (!f && name[0] != '/') { | 268 | if (!f && name != NULL && name[0] != '/') { |
269 | env = getenv(SRCTREE); | 269 | env = getenv(SRCTREE); |
270 | if (env) { | 270 | if (env) { |
271 | sprintf(fullname, "%s/%s", env, name); | 271 | sprintf(fullname, "%s/%s", env, name); |