From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bryan Wu Date: Fri, 15 Aug 2014 13:55:28 -0700 Subject: [U-Boot] [PATCH 3/3] bootm: make sure pass NULL when argc < 1 In-Reply-To: <1408136128-16240-1-git-send-email-pengw@nvidia.com> References: <1408136128-16240-1-git-send-email-pengw@nvidia.com> Message-ID: <1408136128-16240-3-git-send-email-pengw@nvidia.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de arg[0] might not be NULL even if argc < 1, so fix this as before. Signed-off-by: Bryan Wu --- common/bootm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/common/bootm.c b/common/bootm.c index 85b71ba..e75a825 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -732,10 +732,11 @@ static const void *boot_get_kernel(cmd_tbl_t *cmdtp, int flag, int argc, #endif #if defined(CONFIG_FIT) - img_addr = genimg_get_kernel_addr(argv[0], &fit_uname_config, + img_addr = genimg_get_kernel_addr(argc < 1 ? NULL : argv[0], + &fit_uname_config, &fit_uname_kernel); #else - img_addr = genimg_get_kernel_addr(argv[0]); + img_addr = genimg_get_kernel_addr(argc < 1 ? NULL : argv[0]); #endif bootstage_mark(BOOTSTAGE_ID_CHECK_MAGIC); -- 1.9.1