branch master updated: * tp/Texinfo/XS/parsetexi/separator.c (handle_comma): when getting a line in an inline* ignored last argument, set line to the new text gotten, even if null, as otherwise the previously freed line (freed as alloc_line) may be used.

[Patrice Dumas]

This is an automated email from the git hooks/post-receive script.

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new c345ece64f * tp/Texinfo/XS/parsetexi/separator.c (handle_comma): when 
getting a line in an inline* ignored last argument, set line to the new text 
gotten, even if null, as otherwise the previously freed line (freed as 
alloc_line) may be used.
c345ece64f is described below

commit c345ece64fccc235d24b24cb4e4aaee684294969
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Mar 12 19:00:36 2023 +0100

    * tp/Texinfo/XS/parsetexi/separator.c (handle_comma): when getting
    a line in an inline* ignored last argument, set line to the new text
    gotten, even if null, as otherwise the previously freed line (freed as
    alloc_line) may be used.
---
 ChangeLog                           | 7 +++++++
 tp/Texinfo/XS/parsetexi/separator.c | 7 ++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 40e569a70f..f34ef6eaff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,13 @@
        * doc/texinfo-tex-test.texi (Line macros): Update.  Add case with
        substitution into @example environment.
 
+2023-03-12  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/XS/parsetexi/separator.c (handle_comma): when getting
+       a line in an inline* ignored last argument, set line to the new text
+       gotten, even if null, as otherwise the previously freed line (freed as
+       alloc_line) may be used.
+
 2023-03-12  Patrice Dumas  <pertusus@free.fr>
 
        Update po files
diff --git a/tp/Texinfo/XS/parsetexi/separator.c 
b/tp/Texinfo/XS/parsetexi/separator.c
index abf6a671a5..dd0790cc55 100644
--- a/tp/Texinfo/XS/parsetexi/separator.c
+++ b/tp/Texinfo/XS/parsetexi/separator.c
@@ -659,6 +659,7 @@ handle_comma (ELEMENT *current, char **line_inout)
                         text_append_n (&arg->text, line, 1);
                       break;
                     default:
+                /* FIXME probably useless, as line should be an empty string? 
*/
                       text_append (&arg->text, line);
                       line = next_text (e);
                       if (!line)
@@ -687,7 +688,7 @@ handle_comma (ELEMENT *current, char **line_inout)
           expandp = 0;
         }
 
-      /* If this command is not being expanded, add a dummy argument, and
+      /* If this command is not being expanded, add an elided argument, and
          scan forward to the closing brace. */
       if (!expandp)
         {
@@ -720,12 +721,12 @@ handle_comma (ELEMENT *current, char **line_inout)
                     text_append_n (&arg->text, line, 1);
                   break;
                 default:
+                /* FIXME probably useless, as line should be an empty string? 
*/
                   text_append (&arg->text, line);
                   free (alloc_line);
-                  alloc_line = next_text (e);
+                  line = alloc_line = next_text (e);
                   if (!alloc_line)
                     goto funexit;
-                  line = alloc_line;
                   continue;
                 }
               line++;