diff options
| author | Steve Sakoman <steve@sakoman.com> | 2012-06-07 10:19:18 -0700 |
|---|---|---|
| committer | Scott Wood <scott@tyr.buserror.net> | 2012-06-08 14:57:24 -0500 |
| commit | 8d75c8964baa76d097edb4aa4b0474600f2998ba (patch) | |
| tree | 056e850371fcdb988da4d3e33e362c3bfc37de6b /common/cmd_nand.c | |
| parent | fedab338f3459315cb69627fcf46032ec8df1753 (diff) | |
| download | u-boot-imx-8d75c8964baa76d097edb4aa4b0474600f2998ba.zip u-boot-imx-8d75c8964baa76d097edb4aa4b0474600f2998ba.tar.gz u-boot-imx-8d75c8964baa76d097edb4aa4b0474600f2998ba.tar.bz2 | |
cmd_nand: fix crashing bug in nand read/write
Commit 418396e212b59bf907dbccad997ff50f7eb61b16 introduced a
bug that causes nand read and nand write to crash in strcmp
due to a null pointer.
Root cause is that strchr(cmd, '.') returns a null pointer when
the input string does not contain a '.'
The strcmp function does not check for null pointers, resulting
in a crash.
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Scott Wood <scott@tyr.buserror.net>
Diffstat (limited to 'common/cmd_nand.c')
| -rw-r--r-- | common/cmd_nand.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/cmd_nand.c b/common/cmd_nand.c index fa44295..a91ccf4 100644 --- a/common/cmd_nand.c +++ b/common/cmd_nand.c @@ -617,7 +617,7 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) s = strchr(cmd, '.'); - if (!strcmp(s, ".raw")) { + if (s && !strcmp(s, ".raw")) { raw = 1; if (arg_off(argv[3], &dev, &off, &size)) |