Changeset 3440 in kBuild

Timestamp:

Sep 10, 2020 11:38:27 AM (5 years ago)

Author:

bird

Message:

kash: Must make sure nfile::expfname is initialized and set to NULL after use, or we risk copying random stuff. Fixed bug in copynodelist.

Location:

trunk/src/kash

Files:

• eval.c (modified) (6 diffs)
• parser.c (modified) (2 diffs)

trunk/src/kash/eval.c

@@ -104 +104 @@
 STATIC void evalsubshell(shinstance *, union node *, int);
 STATIC void expredir(shinstance *, union node *);
+STATIC void expredircleanup(shinstance *, union node *);
 STATIC void evalpipe(shinstance *, union node *);
 STATIC void evalcommand(shinstance *, union node *, int, struct backcmd *);
@@ -251 +252 @@
                 evaltree(psh, n->nredir.n, flags);
                 popredir(psh);
+                expredircleanup(psh, n->nredir.redirect);
                 break;
         case NSUBSHELL:
@@ -473 +475 @@
                 psh->exitstatus = waitforjob(psh, jp);
         INTON;
+        expredircleanup(psh, n->nredir.redirect);
 }
 
@@ -504 +507 @@
                                 fixredir(psh, redir, fn.list->text, 1);
                         }
+                        break;
+                }
+        }
+}
+
+STATIC void
+expredircleanup(shinstance *psh, union node *n)
+{
+        for (; n ; n = n->nfile.next) {
+                struct arglist fn;
+                fn.lastp = &fn.list;
+                switch (n->type) {
+                case NFROMTO:
+                case NFROM:
+                case NTO:
+                case NCLOBBER:
+                case NAPPEND:
+                        n->nfile.expfname = NULL;
                         break;
                 }
@@ -1238 +1259 @@
                         evalcommand_parent(psh, flags, args.lastarg, &args.smark, mode, jp,
                                                            args.pip, backcmd);
+                        expredircleanup(psh, cmd->ncmd.redirect);
                         return; /* at end of routine */
                 }
@@ -1248 +1270 @@
                 evalcommand_doit(psh, cmd, &args);
         }
+        expredircleanup(psh, cmd->ncmd.redirect);
 }
 

trunk/src/kash/parser.c

@@ -1204 +1204 @@
 
         np = (union node *)stalloc(psh, sizeof (struct nfile));
+        np->nfile.expfname = NULL;
         if (c == '>') {
                 np->nfile.fd = 1;
@@ -1793 +1794 @@
                         ppnext = &dst->next;
                         dst->n = copyparsetree(psh, src->n);
+                        src = src->next;
                 }
         }