cmd/6c, cmd/8c: fix stack allocated Biobuf leaking at exit

Fixes #5085.

{6,8}c/swt.c allocates a third Biobuf in automatic memory which is not terminated at the end of the function. This causes the buffer to be 'in use' when the batexit handler fires, confusing valgrind.

Huge thanks to DMorsing for the diagnosis.

R=golang-dev, daniel.morsing, rsc
CC=golang-dev
https://golang.org/cl/7844044

diff --git a/src/cmd/6c/swt.c b/src/cmd/6c/swt.c
index 58d6d51291caae0b15f0bfe0ed347966957a93da..541c7beaaac47e3d17a52047c65a723bba1b5b60 100644 (file)
--- a/src/cmd/6c/swt.c
+++ b/src/cmd/6c/swt.c
@@ -320,7 +320,7 @@ outcode(void)
                zaddr(&b, &p->from, sf);
                zaddr(&b, &p->to, st);
        }
-       Bflush(&b);
+       Bterm(&b);
        close(f);
        firstp = P;
        lastp = P;

diff --git a/src/cmd/8c/swt.c b/src/cmd/8c/swt.c
index d331eee1ae14e426bfcd274090ec5f758fd19881..1b8ceb0c69d001e720611254ce7686416c235a99 100644 (file)
--- a/src/cmd/8c/swt.c
+++ b/src/cmd/8c/swt.c
@@ -324,7 +324,7 @@ outcode(void)
                zaddr(&b, &p->from, sf);
                zaddr(&b, &p->to, st);
        }
-       Bflush(&b);
+       Bterm(&b);
        close(f);
        firstp = P;
        lastp = P;