summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2011-10-16 12:07:05 +0200
committerJim Meyering <meyering@redhat.com>2011-10-17 17:44:54 +0200
commit537f9da37fa396af72d8b3e6af274e0bcbeab794 (patch)
tree80c465e50d6b124ccc56b6bf7764738480f65559 /src
parent60cd4c271d35eb94bbf04e07425502ed3bb8697c (diff)
downloadcoreutils-537f9da37fa396af72d8b3e6af274e0bcbeab794.tar.xz
tac: don't misbehave with multiple non-seekable inputs
* src/tac.c (copy_to_temp): Do not reuse the template buffer. Instead, scribble only on a freshly-xstrdup'd copy each time. Free that buffer both here, upon failure, and ... (tac_nonseekable): ...free the buffer in caller, upon success. * tests/misc/tac-2-nonseekable: New file. * tests/Makefile.am (TESTS): Add it. * NEWS (Bug fixes): Mention it. Reported by Ambrose Feinstein in http://debbugs.gnu.org/9762.
Diffstat (limited to 'src')
-rw-r--r--src/tac.c19
1 files changed, 15 insertions, 4 deletions
diff --git a/src/tac.c b/src/tac.c
index 16b918303..2898199a2 100644
--- a/src/tac.c
+++ b/src/tac.c
@@ -447,12 +447,13 @@ copy_to_temp (FILE **g_tmp, char **g_tempfile, int input_fd, char const *file)
FIXME: clean up upon fatal signal. Don't block them, in case
$TMPFILE is a remote file system. */
- char *tempfile = template;
- int fd = mkstemp (template);
+ char *tempfile = xstrdup (template);
+ int fd = mkstemp (tempfile);
if (fd < 0)
{
error (0, errno, _("cannot create temporary file in %s"),
quote (tempdir));
+ free (tempfile);
return false;
}
@@ -462,6 +463,7 @@ copy_to_temp (FILE **g_tmp, char **g_tempfile, int input_fd, char const *file)
error (0, errno, _("cannot open %s for writing"), quote (tempfile));
close (fd);
unlink (tempfile);
+ free (tempfile);
return false;
}
@@ -497,6 +499,7 @@ copy_to_temp (FILE **g_tmp, char **g_tempfile, int input_fd, char const *file)
Fail:
fclose (tmp);
+ free (tempfile);
return false;
}
@@ -508,8 +511,16 @@ tac_nonseekable (int input_fd, const char *file)
{
FILE *tmp_stream;
char *tmp_file;
- return (copy_to_temp (&tmp_stream, &tmp_file, input_fd, file)
- && tac_seekable (fileno (tmp_stream), tmp_file));
+ if (copy_to_temp (&tmp_stream, &tmp_file, input_fd, file))
+ {
+ if (tac_seekable (fileno (tmp_stream), tmp_file))
+ {
+ free (tmp_file);
+ return true;
+ }
+ }
+
+ return false;
}
/* Print FILE in reverse, copying it to a temporary