[7454] parsetexi update

[gavinsmith0123]

Revision: 7454
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7454
Author:   gavin
Date:     2016-10-15 17:49:27 +0000 (Sat, 15 Oct 2016)
Log Message:
-----------
parsetexi update

Modified Paths:
--------------
    trunk/tp/parsetexi/def.c
    trunk/tp/parsetexi/input.c

Modified: trunk/tp/parsetexi/def.c
===================================================================
--- trunk/tp/parsetexi/def.c    2016-10-15 14:26:04 UTC (rev 7453)
+++ trunk/tp/parsetexi/def.c    2016-10-15 17:49:27 UTC (rev 7454)
@@ -357,10 +357,10 @@
       || command == CM_defop)
     {
       arg = next_bracketed_or_word (arg_line, &spaces, 1);
+      if (spaces)
+        add_to_def_args_extra (def_args, "spaces", spaces);
       if (!arg)
         goto finished;
-      if (spaces)
-        add_to_def_args_extra (def_args, "spaces", spaces);
       add_to_def_args_extra (def_args, "class", arg);
     }
 
@@ -371,20 +371,20 @@
       || command == CM_deftypecv)
     {
       arg = next_bracketed_or_word (arg_line, &spaces, 1);
+      if (spaces)
+        add_to_def_args_extra (def_args, "spaces", spaces);
       if (!arg)
         goto finished;
-      if (spaces)
-        add_to_def_args_extra (def_args, "spaces", spaces);
       add_to_def_args_extra (def_args, "type", arg);
     }
 
   /* NAME */
   /* All command types get a name. */
   arg = next_bracketed_or_word (arg_line, &spaces, 1);
+  if (spaces)
+    add_to_def_args_extra (def_args, "spaces", spaces);
   if (!arg)
     goto finished;
-  if (spaces)
-    add_to_def_args_extra (def_args, "spaces", spaces);
   add_to_def_args_extra (def_args, "name", arg);
 
   /* ARGUMENTS */

Modified: trunk/tp/parsetexi/input.c
===================================================================
--- trunk/tp/parsetexi/input.c  2016-10-15 14:26:04 UTC (rev 7453)
+++ trunk/tp/parsetexi/input.c  2016-10-15 17:49:27 UTC (rev 7454)
@@ -103,7 +103,12 @@
   size_t iconv_ret;
 
   outptr = buf->text + buf->end;
-  out_bytes_left = buf->space - buf->end;
+  if (buf->end == buf->space - 1)
+    {
+      errno = E2BIG;
+      return (size_t) -1;
+    }
+  out_bytes_left = buf->space - buf->end - 1;
   iconv_ret = iconv (iconv_state, inbuf, inbytesleft,
                      &outptr, &out_bytes_left);