summaryrefslogtreecommitdiff
path: root/coreutils
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2009-10-08 01:32:44 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2009-10-08 01:32:44 +0200
commitd5fddcd57f4e692dd100121bb66adea8129fdbd6 (patch)
tree48a5885c2bbc2de7c131368f1ddea43b2bdf5717 /coreutils
parentd427689eee559d5306db3ad379da90e0375d5e5f (diff)
downloadbusybox-w32-d5fddcd57f4e692dd100121bb66adea8129fdbd6.tar.gz
busybox-w32-d5fddcd57f4e692dd100121bb66adea8129fdbd6.tar.bz2
busybox-w32-d5fddcd57f4e692dd100121bb66adea8129fdbd6.zip
cp: revert a recent buggy change, and add a comment why it's wrong
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'coreutils')
-rw-r--r--coreutils/cp.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/coreutils/cp.c b/coreutils/cp.c
index 2c0b90bc9..9f6c12367 100644
--- a/coreutils/cp.c
+++ b/coreutils/cp.c
@@ -182,10 +182,12 @@ int cp_main(int argc, char **argv)
182 if (copy_file(*argv, dest, flags) < 0) { 182 if (copy_file(*argv, dest, flags) < 0) {
183 status = EXIT_FAILURE; 183 status = EXIT_FAILURE;
184 } 184 }
185 free((void*)dest);
186 if (*++argv == last) { 185 if (*++argv == last) {
186 /* possibly leaking dest... */
187 break; 187 break;
188 } 188 }
189 /* don't move up: dest may be == last and not malloced! */
190 free((void*)dest);
189 } 191 }
190 192
191 /* Exit. We are NOEXEC, not NOFORK. We do exit at the end of main() */ 193 /* Exit. We are NOEXEC, not NOFORK. We do exit at the end of main() */