Changeset 2290 for trunk/src/kash/eval.c

Timestamp:

Feb 27, 2009, 5:08:07 AM (16 years ago)

Author:

bird

Message:

kash: malloc/free/friends gets a psh.

File:

• trunk/src/kash/eval.c (modified) (3 diffs)

trunk/src/kash/eval.c

@@ -614 +614 @@
         if (sys_path == NULL) {
                 if (sysctl(mib, 2, 0, &len, 0, 0) != -1 &&
-                    (sys_path = ckmalloc(len + 5)) != NULL &&
+                    (sys_path = ckmalloc(psh, len + 5)) != NULL &&
                     sysctl(mib, 2, sys_path + 5, &len, 0, 0) != -1) {
                         memcpy(sys_path, "PATH=", 5);
                 } else {
-                        ckfree(sys_path);
+                        ckfree(psh, sys_path);
                         /* something to keep things happy */
                         sys_path = def_path;
@@ -935 +935 @@
                 if (setjmp(jmploc.loc)) {
                         if (psh->exception == EXSHELLPROC) {
-                                freeparam((volatile struct shparam *)
+                                freeparam(psh, (volatile struct shparam *)
                                     &saveparam);
                         } else {
-                                freeparam(&psh->shellparam);
+                                freeparam(psh, &psh->shellparam);
                                 psh->shellparam = saveparam;
                         }
@@ -957 +957 @@
                 poplocalvars(psh);
                 psh->localvars = savelocalvars;
-                freeparam(&psh->shellparam);
+                freeparam(psh, &psh->shellparam);
                 psh->shellparam = saveparam;
                 psh->handler = savehandler;