diff options
| author | Ron Yorston <rmy@pobox.com> | 2012-03-22 13:56:39 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2012-03-22 13:56:39 +0000 |
| commit | 811c449748d5bd0505f8510e5582892f94ac0cda (patch) | |
| tree | 2640249cb2a9605c7cd59467b9861b205e9bcc8a /coreutils/dd.c | |
| parent | c0d4367d6b581eb5989c02815880cf0fa2851ae8 (diff) | |
| parent | 19311bfa7b8e8c6effa9c375de9b0eb4338bee12 (diff) | |
| download | busybox-w32-811c449748d5bd0505f8510e5582892f94ac0cda.tar.gz busybox-w32-811c449748d5bd0505f8510e5582892f94ac0cda.tar.bz2 busybox-w32-811c449748d5bd0505f8510e5582892f94ac0cda.zip | |
Merge commit '19311bfa7b8e8c6effa9c375de9b0eb4338bee12' into merge
Conflicts:
coreutils/ls.c
shell/ash.c
Diffstat (limited to 'coreutils/dd.c')
| -rw-r--r-- | coreutils/dd.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/coreutils/dd.c b/coreutils/dd.c index da205ec69..544ece051 100644 --- a/coreutils/dd.c +++ b/coreutils/dd.c | |||
| @@ -409,5 +409,11 @@ int dd_main(int argc UNUSED_PARAM, char **argv) | |||
| 409 | out_status: | 409 | out_status: |
| 410 | dd_output_status(0); | 410 | dd_output_status(0); |
| 411 | 411 | ||
| 412 | if (ENABLE_FEATURE_CLEAN_UP) { | ||
| 413 | free(obuf); | ||
| 414 | if (flags & FLAG_TWOBUFS) | ||
| 415 | free(ibuf); | ||
| 416 | } | ||
| 417 | |||
| 412 | return exitcode; | 418 | return exitcode; |
| 413 | } | 419 | } |