from_backend() should always be called with len > 0. Only rlogin

[u/mdw/putty] / plink.c

diff --git a/plink.c b/plink.c
index 891e7d5..b2c07ac 100644 (file)
--- a/plink.c
+++ b/plink.c
@@ -8,6 +8,7 @@
 #include <windows.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <assert.h>
 #include <stdarg.h>
 
 #define PUTTY_DO_GLOBALS              /* actually _define_ globals */
@@ -147,6 +148,8 @@ int from_backend(int is_stderr, char *data, int len)
     HANDLE h = (is_stderr ? errhandle : outhandle);
     int osize, esize;
 
+    assert(len > 0);
+
     if (is_stderr) {
        bufchain_add(&stderr_data, data, len);
        try_output(1);
@@ -422,25 +425,32 @@ int main(int argc, char **argv)
                    }
                }
            } else {
-               int len = sizeof(cfg.remote_cmd) - 1;
-               char *cp = cfg.remote_cmd;
-               int len2;
-
-               strncpy(cp, p, len);
-               cp[len] = '\0';
-               len2 = strlen(cp);
-               len -= len2;
-               cp += len2;
-               while (--argc) {
-                   if (len > 0)
-                       len--, *cp++ = ' ';
-                   strncpy(cp, *++argv, len);
-                   cp[len] = '\0';
-                   len2 = strlen(cp);
-                   len -= len2;
-                   cp += len2;
+               char *command;
+               int cmdlen, cmdsize;
+               cmdlen = cmdsize = 0;
+               command = NULL;
+
+               while (argc) {
+                   while (*p) {
+                       if (cmdlen >= cmdsize) {
+                           cmdsize = cmdlen + 512;
+                           command = srealloc(command, cmdsize);
+                       }
+                       command[cmdlen++]=*p++;
+                   }
+                   if (cmdlen >= cmdsize) {
+                       cmdsize = cmdlen + 512;
+                       command = srealloc(command, cmdsize);
+                   }
+                   command[cmdlen++]=' '; /* always add trailing space */
+                   if (--argc) p = *++argv;
                }
+               if (cmdlen) command[--cmdlen]='\0';
+                                      /* change trailing blank to NUL */
+               cfg.remote_cmd_ptr = command;
+               cfg.remote_cmd_ptr2 = NULL;
                cfg.nopty = TRUE;      /* command => no terminal */
+
                break;                 /* done with cmdline */
            }
        }