Detect EOF when deleting from archive.
See https://savannah.gnu.org/bugs/?63823 * src/delete.c (flush_file): Break the loop on EOF. * tests/delete06.at: New test. * tests/Makefile.am: Add new test. * tests/testsuite.at: Likewise.
This commit is contained in:
@@ -149,6 +149,9 @@ flush_file (void)
|
|||||||
{
|
{
|
||||||
blocks_to_skip -= (record_end - current_block);
|
blocks_to_skip -= (record_end - current_block);
|
||||||
flush_archive ();
|
flush_archive ();
|
||||||
|
if (record_end == current_block)
|
||||||
|
/* Hit EOF */
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
current_block += blocks_to_skip;
|
current_block += blocks_to_skip;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -81,6 +81,7 @@ TESTSUITE_AT = \
|
|||||||
delete03.at\
|
delete03.at\
|
||||||
delete04.at\
|
delete04.at\
|
||||||
delete05.at\
|
delete05.at\
|
||||||
|
delete06.at\
|
||||||
difflink.at\
|
difflink.at\
|
||||||
exclude.at\
|
exclude.at\
|
||||||
exclude01.at\
|
exclude01.at\
|
||||||
|
|||||||
42
tests/delete06.at
Normal file
42
tests/delete06.at
Normal file
@@ -0,0 +1,42 @@
|
|||||||
|
# Process this file with autom4te to create testsuite. -*- Autotest -*-
|
||||||
|
|
||||||
|
# Test suite for GNU tar.
|
||||||
|
# Copyright 2023 Free Software Foundation, Inc.
|
||||||
|
|
||||||
|
# This file is part of GNU tar.
|
||||||
|
|
||||||
|
# GNU tar is free software; you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation; either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
|
||||||
|
# GNU tar is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
# When deleting last partially written member from a truncated archive
|
||||||
|
# tar 1.34 would miss EOF and spin in a dead loop in delete.c:flush_file.
|
||||||
|
# References: https://savannah.gnu.org/bugs/?63823
|
||||||
|
|
||||||
|
AT_SETUP([EOF detection])
|
||||||
|
AT_KEYWORDS([delete delete06])
|
||||||
|
|
||||||
|
AT_TAR_CHECK([
|
||||||
|
mkdir b
|
||||||
|
touch a b/1 c
|
||||||
|
tar -cf archive.tar a b/1 c
|
||||||
|
case $TEST_TAR_FORMAT in
|
||||||
|
gnu) size=1500;;
|
||||||
|
pax) size=3072;;
|
||||||
|
esac
|
||||||
|
dd if=archive.tar of=trunc.tar bs=$size count=1 2>/dev/null
|
||||||
|
tar --delete 'b/' -f trunc.tar
|
||||||
|
],
|
||||||
|
[0],
|
||||||
|
[],[],[],[],[gnu, pax])
|
||||||
|
|
||||||
|
AT_CLEANUP
|
||||||
@@ -320,6 +320,7 @@ m4_include([delete02.at])
|
|||||||
m4_include([delete03.at])
|
m4_include([delete03.at])
|
||||||
m4_include([delete04.at])
|
m4_include([delete04.at])
|
||||||
m4_include([delete05.at])
|
m4_include([delete05.at])
|
||||||
|
m4_include([delete06.at])
|
||||||
|
|
||||||
AT_BANNER([Extracting])
|
AT_BANNER([Extracting])
|
||||||
m4_include([extrac01.at])
|
m4_include([extrac01.at])
|
||||||
|
|||||||
Reference in New Issue
Block a user