From 052a7009b3a508c8d07e4f341a3a4f68ed818d31 Mon Sep 17 00:00:00 2001 From: Juha Niskanen Date: Thu, 19 Apr 2018 04:12:51 +0000 Subject: [PATCH] Merged in juniskane/apps_upstream/echo_fix_pr (pull request #135) apps/nshlib: Fix echo command with zero arguments, broken after commit 8ecf618 Approved-by: Gregory Nutt --- nshlib/nsh_envcmds.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nshlib/nsh_envcmds.c b/nshlib/nsh_envcmds.c index 6839a452c..60964bb56 100644 --- a/nshlib/nsh_envcmds.c +++ b/nshlib/nsh_envcmds.c @@ -264,13 +264,13 @@ int cmd_echo(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) int i; int s = 1; - if (0 == strncmp(argv[1], "-n", 2)) + if (argc > 1 && 0 == strncmp(argv[1], "-n", 2)) { s = 2; } /* echo each argument, separated by a space as it must have been on the - * command line + * command line. */ for (i = s; i < argc; i++)