mirror of
https://git.savannah.gnu.org/git/coreutils.git
synced 2026-11-17 18:02:09 +03:00
split: don't create more than N input files with -n l/N and short lines
* src/split.c (lines_chunk_split): Make sure CHUNK_NO does not exceed N. * tests/split/l-chunk.sh: Add a test case without --elide-empty-files and with it. * NEWS: Mention the bug fix. Discovered by Anthropic's OSS Scanner, as bug ANT-2026-ZDDBFXXM.
This commit is contained in:
1 parent
79063df078
commit
20faee4d42
3 files changed
+40
-1
No files matched your search
@@ -199,6 +199,12 @@ GNU coreutils NEWS -*- outline -*-
|
||||
alphabet, giving arbitrary and repeated file names, thus losing output.
|
||||
[bug introduced with the --hex-suffixes option in coreutils-8.28]
|
||||
|
||||
'split --number=l/N' no longer creates more than N output files,
|
||||
truncating them if they exist, or loops infinitely when used with
|
||||
--elide-empty-files, when the input is smaller than N bytes and ends
|
||||
with a newline.
|
||||
[bug introduced in coreutils-9.2]
|
||||
|
||||
'stty' again rejects empty speed arguments.
|
||||
Previously such arguments were accepted as value 0.
|
||||
[bug introduced in coreutils-9.8]
|
||||
|
||||
+1
-1
@@ -1052,7 +1052,7 @@ lines_chunk_split (intmax_t k, intmax_t n, char *buf, idx_t bufsize,
|
||||
return;
|
||||
chunk_end += chunk_size + (chunk_no < rem_bytes);
|
||||
chunk_no++;
|
||||
if (chunk_end <= n_written)
|
||||
if (chunk_no <= n && chunk_end <= n_written)
|
||||
{
|
||||
if (! k)
|
||||
cwrite (true, NULL, 0);
|
||||
|
||||
@@ -126,4 +126,37 @@ printf '5' > exp
|
||||
split -n l/7/7 in > out
|
||||
compare exp out || fail=1
|
||||
|
||||
# In coreutils-9.2 through coreutils-9.12, this would exit with a failure
|
||||
# upon exhausting output files, overwriting them if they exist.
|
||||
printf 'a\n' >in &&
|
||||
printf 'b\n' >out.af &&
|
||||
cp out.af exp-out.af &&
|
||||
truncate -s 0 exp || framework_failure_
|
||||
split -n l/5 in out. >out 2>err || fail=1
|
||||
compare /dev/null out || fail=1
|
||||
compare /dev/null err || fail=1
|
||||
set -- out.*
|
||||
files="$*"
|
||||
exp_files='out.aa out.ab out.ac out.ad out.ae out.af'
|
||||
test "$files" = "$exp_files" || fail=1
|
||||
for file in $exp_files; do
|
||||
exp=exp
|
||||
if test $file = out.aa; then
|
||||
exp=in
|
||||
elif test $file = out.af; then
|
||||
exp=exp-out.af
|
||||
fi
|
||||
compare $exp $file || fail=1
|
||||
done
|
||||
rm -f $exp_files || framework_failure_
|
||||
|
||||
# In coreutils-9.2 through coreutils-9.12, this would loop infinitely.
|
||||
printf 'a\n' >in || fail=1
|
||||
timeout 10 split -e -n l/5 in out. >out 2>err || fail=1
|
||||
compare /dev/null out || fail=1
|
||||
compare /dev/null err || fail=1
|
||||
set -- out.*
|
||||
test "$*" = out.aa || fail=1
|
||||
compare in out.aa || fail=1
|
||||
|
||||
Exit $fail
|
||||
Reference in new issue
Block a user