Merge branch 'busybox' into merge

2 files changed, 18 insertions, 4 deletions

diff --git a/coreutils/tsort.c b/coreutils/tsort.c
index a451ed2ff..e1ee6bcd7 100644
--- a/coreutils/tsort.c
+++ b/coreutils/tsort.c
@@ -101,6 +101,10 @@ int tsort_main(int argc UNUSED_PARAM, char **argv)
         ssize_t len;
         struct node *a;
         int cycles;
+        unsigned i;
+#if ENABLE_FEATURE_CLEAN_UP
+        unsigned max_len;
+#endif
 
         INIT_G();
 
@@ -152,9 +156,11 @@ int tsort_main(int argc UNUSED_PARAM, char **argv)
          *   - if any nodes are left, they form cycles.
          */
         cycles = 0;
+#if ENABLE_FEATURE_CLEAN_UP
+        max_len = G.nodes_len;
+#endif
         while (G.nodes_len) {
                 struct node *n;
-                unsigned i;
 
                 /* Search for first node with no incoming edges */
                 for (i = 0; i < G.nodes_len; i++) {
@@ -173,16 +179,24 @@ int tsort_main(int argc UNUSED_PARAM, char **argv)
                 /* Remove the node (need no longer maintain sort) */
                 n = G.nodes[i];
                 G.nodes[i] = G.nodes[--G.nodes_len];
+#if ENABLE_FEATURE_CLEAN_UP
+                /* Keep reference to removed node so it can be freed */
+                G.nodes[G.nodes_len] = n;
+#endif
 
                 /* And remove its outgoing edges */
                 for (i = 0; i < n->out_count; i++)
                         n->out[i]->in_count--;
-                free(n->out);
 
                 puts(n->name);
-                free(n);
+        }
+#if ENABLE_FEATURE_CLEAN_UP
+        for (i = 0; i < max_len; i++) {
+                free(G.nodes[i]->out);
+                free(G.nodes[i]);
         }
         free(G.nodes);
+#endif
 
         fflush_stdout_and_exit(cycles ? 1 : 0);
 }
diff --git a/shell/ash.c b/shell/ash.c
index 95f399b0b..634f4ce79 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -15860,7 +15860,7 @@ init(void)
         int import = 0;
 #else
         /* we will never free this */
-        basepf.next_to_pgetc = basepf.buf = ckmalloc(IBUFSIZ);
+        basepf.next_to_pgetc = basepf.buf = ckzalloc(IBUFSIZ);
         basepf.linno = 1;
 
         sigmode[SIGCHLD - 1] = S_DFL; /* ensure we install handler even if it is SIG_IGNed */