Index: /branches/eam_branches/ohana.20190329/src/opihi/lib.shell/multicommand.c
===================================================================
--- /branches/eam_branches/ohana.20190329/src/opihi/lib.shell/multicommand.c	(revision 40815)
+++ /branches/eam_branches/ohana.20190329/src/opihi/lib.shell/multicommand.c	(revision 40816)
@@ -63,4 +63,6 @@
 
   p = line; 
+  int Nline = strlen(line);
+  
   done = FALSE;
   status = TRUE;
@@ -74,9 +76,15 @@
     tmpline = strncreate (p, q - p);
     stripwhite (tmpline);
+    myAssert (tmpline, "oops");
 
     // empty command, free and continue
     if (*tmpline == 0) {
       free (tmpline);
-      p = q + 1;
+      if (q == line + Nline) {
+	done = TRUE;
+      } else {
+	p = q + 1;
+	myAssert (p - line <= Nline, "oops");
+      }
       continue;
     }