diff options
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | src/tac.c | 11 | ||||
| -rwxr-xr-x | tests/misc/tac-2-nonseekable.sh | 3 |
3 files changed, 10 insertions, 7 deletions
@@ -50,6 +50,9 @@ GNU coreutils NEWS -*- outline -*- seq now immediately exits upon write errors. [This bug was present in "the beginning".] + tac no longer crashes when there are issues reading from non-seekable inputs. + [bug introduced in coreutils-8.15] + tail -F now continues to process initially untailable files that are replaced by a tailable file. This was handled correctly when inotify was available, and is now handled correctly in all cases. @@ -477,6 +477,7 @@ temp_stream (FILE **fp, char **file_name) } else { + clearerr (tmp_fp); if (fseeko (tmp_fp, 0, SEEK_SET) < 0 || ftruncate (fileno (tmp_fp), 0) < 0) { @@ -512,13 +513,13 @@ copy_to_temp (FILE **g_tmp, char **g_tempfile, int input_fd, char const *file) if (bytes_read == SAFE_READ_ERROR) { error (0, errno, _("%s: read error"), quotef (file)); - goto Fail; + return -1; } if (fwrite (G_buffer, 1, bytes_read, fp) != bytes_read) { error (0, errno, _("%s: write error"), quotef (file_name)); - goto Fail; + return -1; } /* Implicitly <= OFF_T_MAX due to preceding fwrite(), @@ -530,16 +531,12 @@ copy_to_temp (FILE **g_tmp, char **g_tempfile, int input_fd, char const *file) if (fflush (fp) != 0) { error (0, errno, _("%s: write error"), quotef (file_name)); - goto Fail; + return -1; } *g_tmp = fp; *g_tempfile = file_name; return bytes_copied; - - Fail: - fclose (fp); - return -1; } /* Copy INPUT_FD to a temporary, then tac that file. diff --git a/tests/misc/tac-2-nonseekable.sh b/tests/misc/tac-2-nonseekable.sh index 47e7849ad..d148218c1 100755 --- a/tests/misc/tac-2-nonseekable.sh +++ b/tests/misc/tac-2-nonseekable.sh @@ -36,4 +36,7 @@ for file in /proc/version /sys/kernel/profiling; do fi done +# This failed due to heap corruption from v8.15-v8.25 inclusive. +returns_ 1 tac - - <&- 2>err || fail=1 + Exit $fail |