d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix file descriptor leaks in cmp(1)

Browse Source 
Also, add a few test cases

Reported by:	Coverity
CID:		271624 275338
Reviewed by:	ngie
MFC after:	4 weeks
Sponsored by:	Spectra Logic Corp
Differential Revision:	https://reviews.freebsd.org/D9074
This commit is contained in:
Alan Somers 2017-01-07 00:59:06 +00:00
parent 05ea86b0c0
commit 4e354796e9
3 changed files with 70 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usr.bin/cmp/special.c
View File

@ -99,6 +99,8 @@ eof: if (ferror(fp1))
} else
if (feof(fp2))
eofmsg(file2);
fclose(fp2);
fclose(fp1);
if (dfound)
exit(DIFF_EXIT);
}

1
usr.bin/cmp/tests/Makefile
View File

@ -2,6 +2,7 @@
.include <bsd.own.mk>
ATF_TESTS_SH+= cmp_test2
NETBSD_ATF_TESTS_SH= cmp_test
.include <netbsd-tests.test.mk>

67
usr.bin/cmp/tests/cmp_test2.sh Executable file
View File

@ -0,0 +1,67 @@
# Copyright (c) 2017 Alan Somers
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
# $FreeBSD$
atf_test_case special
special_head() {
atf_set "descr" "Test cmp(1)'s handling of non-regular files"
}
special_body() {
echo 0123456789abcdef > a
echo 0123456789abcdeg > b
cat a | atf_check -s exit:0 cmp a -
cat a | atf_check -s exit:0 cmp - a
cat b | atf_check -s not-exit:0 cmp a -
cat b | atf_check -s not-exit:0 cmp - a
true
}
atf_test_case symlink
symlink_head() {
atf_set "descr" "Test cmp(1)'s handling of symlinks"
}
symlink_body() {
echo 0123456789abcdef > a
echo 0123456789abcdeg > b
ln -s a a.lnk
ln -s b b.lnk
ln -s a a2.lnk
cp a adup
ln -s adup adup.lnk
atf_check -s exit:0 cmp a a.lnk
atf_check -s exit:0 cmp a.lnk a
atf_check -s not-exit:0 -o ignore cmp a b.lnk
atf_check -s not-exit:0 -o ignore cmp b.lnk a
atf_check -s not-exit:0 -o ignore -e ignore cmp -h a a.lnk
atf_check -s not-exit:0 -o ignore -e ignore cmp -h a.lnk a
atf_check -s exit:0 cmp -h a.lnk a2.lnk
atf_check -s not-exit:0 -o ignore -e ignore cmp -h a.lnk adup.lnk
}
atf_init_test_cases()
{
atf_add_test_case special
atf_add_test_case symlink
}