summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2009-10-07 23:32:44 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2009-10-07 23:32:44 (GMT)
commitd5fddcd57f4e692dd100121bb66adea8129fdbd6 (patch)
tree48a5885c2bbc2de7c131368f1ddea43b2bdf5717
parentd427689eee559d5306db3ad379da90e0375d5e5f (diff)
downloadbusybox-d5fddcd57f4e692dd100121bb66adea8129fdbd6.tar.gz
busybox-d5fddcd57f4e692dd100121bb66adea8129fdbd6.tar.bz2
cp: revert a recent buggy change, and add a comment why it's wrong
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--coreutils/cp.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/coreutils/cp.c b/coreutils/cp.c
index 2c0b90b..9f6c123 100644
--- a/coreutils/cp.c
+++ b/coreutils/cp.c
@@ -182,10 +182,12 @@ int cp_main(int argc, char **argv)
if (copy_file(*argv, dest, flags) < 0) {
status = EXIT_FAILURE;
}
- free((void*)dest);
if (*++argv == last) {
+ /* possibly leaking dest... */
break;
}
+ /* don't move up: dest may be == last and not malloced! */
+ free((void*)dest);
}
/* Exit. We are NOEXEC, not NOFORK. We do exit at the end of main() */