gawk-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[gawk-diffs] [SCM] gawk branch, wasted-byte, updated. gawk-4.1.0-1013-g6


From: Arnold Robbins
Subject: [gawk-diffs] [SCM] gawk branch, wasted-byte, updated. gawk-4.1.0-1013-g6e786e9
Date: Sun, 14 Dec 2014 19:29:44 +0000

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 "gawk".

The branch, wasted-byte has been updated
       via  6e786e9ea47966a9cac7cfef4a4079ac379580b0 (commit)
      from  c55956b6a10d0a4d0b151c1be976dc9c344c1103 (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.sv.gnu.org/cgit/gawk.git/commit/?id=6e786e9ea47966a9cac7cfef4a4079ac379580b0

commit 6e786e9ea47966a9cac7cfef4a4079ac379580b0
Author: Arnold D. Robbins <address@hidden>
Date:   Sun Dec 14 21:29:24 2014 +0200

    Fix to previous change. Now passes valgrind.

diff --git a/ChangeLog b/ChangeLog
index f890a70..851eab2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,8 +5,8 @@
        * command.y (append_statement): Ditto.
        * debug.c (gprintf, serialize): Ditto.
        * field.c (set_FIELDWIDTHS): Ditto.
-       * io.c.c (init_awkpath, grow_iop_buffer): Ditto.
-       * profile.c (pp_string, pp_concat, pp_group3): Ditto.
+       * io.c.c (grow_iop_buffer): Ditto.
+       * profile.c (pp_string, pp_group3): Ditto.
 
 2014-12-14         Andrew J. Schorr     <address@hidden>
 
diff --git a/io.c b/io.c
index 86dfc13..a819a4a 100644
--- a/io.c
+++ b/io.c
@@ -2554,7 +2554,8 @@ init_awkpath(path_info *pi)
                        end++;
                len = end - start;
                if (len > 0) {
-                       emalloc(p, char *, len + 1, "init_awkpath");
+                       /* +2 is correct here; leave room for / */
+                       emalloc(p, char *, len + 2, "init_awkpath");
                        memcpy(p, start, len);
 
                        /* add directory punctuation if necessary */
diff --git a/profile.c b/profile.c
index 45eb562..886f2b0 100644
--- a/profile.c
+++ b/profile.c
@@ -1505,7 +1505,7 @@ pp_concat(int nargs)
        len = -delimlen;
        for (i = nargs; i >= 1; i--) {
                r = pp_args[i] = pp_pop();
-               len += r->pp_len + delimlen + 1;
+               len += r->pp_len + delimlen + 2;
        }
 
        emalloc(str, char *, len + 1, "pp_concat");

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

Summary of changes:
 ChangeLog |    4 ++--
 io.c      |    3 ++-
 profile.c |    2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
gawk



reply via email to

[Prev in Thread] Current Thread [Next in Thread]