[git commit] randomconfig fixes 5: false positive for tar; mount emits corrupted message

Denys Vlasenko vda.linux at googlemail.com
Mon Jun 20 09:04:04 UTC 2016


commit: https://git.busybox.net/busybox/commit/?id=ecf25cb5bce27ca5820e2895d8458f38c406d105
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 testsuite/tar.tests | 2 +-
 util-linux/mount.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/testsuite/tar.tests b/testsuite/tar.tests
index f19a53d..c44b7ad 100755
--- a/testsuite/tar.tests
+++ b/testsuite/tar.tests
@@ -204,7 +204,7 @@ SKIP=
 
 # Had a bug where on extract autodetect first "switched off" -z
 # and then failed to recognize .tgz extension
-optional FEATURE_TAR_CREATE FEATURE_SEAMLESS_GZ
+optional FEATURE_TAR_CREATE FEATURE_SEAMLESS_GZ GUNZIP
 testing "tar extract tgz" "\
 dd count=1 bs=1M if=/dev/zero of=F0 2>/dev/null
 tar -czf F0.tgz F0
diff --git a/util-linux/mount.c b/util-linux/mount.c
index c76f6ef..cef4f74 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -2058,7 +2058,7 @@ static int singlemount(struct mntent *mp, int ignore_busy)
 		del_loop(mp->mnt_fsname);
 		if (ENABLE_FEATURE_CLEAN_UP) {
 			free(loopFile);
-			free(mp->mnt_fsname);
+			/* No, "rc != 0" needs it: free(mp->mnt_fsname); */
 		}
 	}
 


More information about the busybox-cvs mailing list