Changeset 3445 for trunk/src

Timestamp:

Sep 10, 2020, 10:47:45 PM (5 years ago)

Author:

bird

Message:

kash: fixed a couple of alloctions when setting up subshells. Must pass redir to openhere_child.

Location:

trunk/src/kash

Files:

• options.c (modified) (1 diff)
• redir.c (modified) (2 diffs)

trunk/src/kash/options.c

@@ -132 +132 @@
     psh->shellparam.nparam = left = inherit->shellparam.nparam;
     assert(left >= 0);
-    psh->shellparam.p = (char **)ckmalloc(psh, left + 1);
+    psh->shellparam.p = (char **)ckmalloc(psh, (left + 1) * sizeof(psh->shellparam.p[0]));
     psh->shellparam.p[left] = NULL;
     while (left-- > 0) {

trunk/src/kash/redir.c

@@ -104 +104 @@
         do
         {
-            struct redirtab *dst = ckmalloc(psh, sizeof(dst));
+            struct redirtab *dst = ckmalloc(psh, sizeof(*dst));
             memcpy(dst->renamed, src->renamed, sizeof(dst->renamed));
             *dstp = dst;
@@ -314 +314 @@
                 args.pip[1] = pip[1];
                 args.len = len;
-                forkshell2(psh, (struct job *)NULL, (union node *)NULL,
+                forkshell2(psh, (struct job *)NULL, redir,
                            FORK_NOJOB | FORK_JUST_IO,
                            openhere_child, redir, &args, sizeof(args), NULL);