From: Mark Wooding <mdw@distorted.org.uk>
Date: Fri, 13 May 2011 19:26:13 +0000 (+0100)
Subject: file.c (file_read): Copy name when duplicating input file spec.
X-Git-Tag: 1.3.6~5
X-Git-Url: https://git.distorted.org.uk/~mdw/fwd/commitdiff_plain/d105b00f8fd71a064353bc17192fc4985726721a?ds=inline

file.c (file_read): Copy name when duplicating input file spec.

If only one filespec is provided to the file endpoint, then it copies
the input spec (which it's already parsed) to the output.  But this
isn't enough because the spec might contain a dynamically allocated
filename.  The function `file_destroy' unconditionally frees both names,
which is a double-free bug.

Fix this in the stupid way, by allocating a separate copy of the
filename if we duplicate the input filespec.  (I could fix it in
`file_destroy' instead, but that becomes a little fiddly, and it's
rather brittle.
---

diff --git a/file.c b/file.c
index cc319ce..88b7666 100644
--- a/file.c
+++ b/file.c
@@ -242,13 +242,15 @@ static void file_fspec(fspec *f, scanner *sc)
 static void file_read(fdata *f, scanner *sc)
 {
   file_fspec(&f->in, sc);
-  if (sc->t != ',') {
+  if (sc->t == ',') {
+    token(sc);
+    file_fspec(&f->out, sc);
+  } else {
     f->out = f->in;
     if (f->out.type == FTYPE_FD && f->out.u.fd == rstdin)
       f->out.u.fd = rstdout;
-  } else {
-    token(sc);
-    file_fspec(&f->out, sc);
+    else if (f->out.type == FTYPE_NAME)
+      f->out.u.name = xstrdup(f->in.u.name);
   }
   f->fa = fattr_global;
   f->fo = file_opts;