[cmdline] Fix image command-line construction for zero-length argument lists

This fixes a bug introduced in commit 4c85017.

diff --git a/src/hci/commands/image_cmd.c b/src/hci/commands/image_cmd.c
index 23843a7e43a39f602c2cc2248a4112a81aaed592..b651078b68ba511b36901b18b1d784052edee107 100644 (file)
--- a/src/hci/commands/image_cmd.c
+++ b/src/hci/commands/image_cmd.c
@@ -55,18 +55,21 @@ static int imgfill_cmdline ( struct image *image, unsigned int nargs,
        /* Determine total length of command line */
        len = 1; /* NUL */
        for ( i = 0 ; i < nargs ; i++ )
-               len += ( 1 /* space */ + strlen ( args[i] ) );
+               len += ( 1 /* possible space */ + strlen ( args[i] ) );
 
        {
                char buf[len];
                char *ptr = buf;
 
                /* Assemble command line */
-               for ( i = 0 ; i < nargs ; i++ )
-                       ptr += sprintf ( ptr, " %s", args[i] );
-               assert ( ptr == ( buf + len - 1 ) );
+               buf[0] = '\0';
+               for ( i = 0 ; i < nargs ; i++ ) {
+                       ptr += sprintf ( ptr, "%s%s", ( i ? " " : "" ),
+                                        args[i] );
+               }
+               assert ( ptr < ( buf + len ) );
 
-               return image_set_cmdline ( image, &buf[1] );
+               return image_set_cmdline ( image, buf );
        }
 }