[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_1-335-g0e8582e

[Mats Erik Andersson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  0e8582e3043a015a1d770056b58f0a8d80ab139b (commit)
      from  e91377394b0431b98f7125f015e0d1c78823589c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=0e8582e3043a015a1d770056b58f0a8d80ab139b


commit 0e8582e3043a015a1d770056b58f0a8d80ab139b
Author: Mats Erik Andersson <address@hidden>
Date:   Thu Sep 5 00:49:19 2013 +0200

    ftp: Macro execution segfaults.

diff --git a/ChangeLog b/ChangeLog
index 2bad14a..03c727c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2013-09-05  Mats Erik Andersson  <address@hidden>
+
+       ftp: Macro execution segfaults.
+       Abort macro execution when command is ambiguous,
+       is invalid, or if the control connection has been
+       lost.  Otherwise segmentation faults can happen
+       when the macro includes further commands.
+
+       * ftp/domacro.c (domacro) <ambiguous, invalid>
+       <not connected>: Reset LOOPFLG and break loop.
+       Error message gives name of offending command.
+
 2013-09-03  Mats Erik Andersson  <address@hidden>
 
        ftp: Avoid numeric size of char array.
diff --git a/ftp/domacro.c b/ftp/domacro.c
index 1d2cc94..db7d9b3 100644
--- a/ftp/domacro.c
+++ b/ftp/domacro.c
@@ -142,18 +142,24 @@ domacro (int argc, char *argv[])
 
          if (c == (struct cmd *) -1)
            {
-             printf ("?Ambiguous command\n");
+             printf ("?Ambiguous command: '%s'.\n", margv[0]);
              code = -1;
+             loopflg = 0;
+             break;
            }
          else if (c == 0)
            {
-             printf ("?Invalid command\n");
+             printf ("?Invalid command: '%s'.\n", margv[0]);
              code = -1;
+             loopflg = 0;
+             break;
            }
          else if (c->c_conn && !connected)
            {
-             printf ("Not connected.\n");
+             printf ("Not connected, needed for '%s'.\n", margv[0]);
              code = -1;
+             loopflg = 0;
+             break;
            }
          else
            {

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog     |   12 ++++++++++++
 ftp/domacro.c |   12 +++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GNU Inetutils