aboutsummaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2015-08-04 09:46:24 +0100
committerRon Yorston <rmy@pobox.com>2015-08-04 09:46:24 +0100
commit64fde14d12cc5e6182f114ecaf4340ec1854c2f6 (patch)
tree4d2cabca7865dd74e2344834d89503c534fb502c /shell
parent7aabb625005c642d6a30d6d97b51bf183429152e (diff)
parent16aa7a73c40ba5dfaabaedb8a5533619cb8b6cb6 (diff)
downloadbusybox-w32-64fde14d12cc5e6182f114ecaf4340ec1854c2f6.tar.gz
busybox-w32-64fde14d12cc5e6182f114ecaf4340ec1854c2f6.tar.bz2
busybox-w32-64fde14d12cc5e6182f114ecaf4340ec1854c2f6.zip
Merge branch 'busybox' into merge
Diffstat (limited to 'shell')
-rw-r--r--shell/ash.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/shell/ash.c b/shell/ash.c
index 349e9deb8..f23a3e1ff 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -5030,7 +5030,7 @@ forkchild(struct job *jp, union node *n, int mode)
5030 * Our solution: ONLY bare $(trap) or `trap` is special. 5030 * Our solution: ONLY bare $(trap) or `trap` is special.
5031 */ 5031 */
5032 /* Save trap handler strings for trap builtin to print */ 5032 /* Save trap handler strings for trap builtin to print */
5033 trap_ptr = memcpy(xmalloc(sizeof(trap)), trap, sizeof(trap)); 5033 trap_ptr = xmemdup(trap, sizeof(trap));
5034 /* Fall through into clearing traps */ 5034 /* Fall through into clearing traps */
5035 } 5035 }
5036 clear_traps(); 5036 clear_traps();