summaryrefslogtreecommitdiff
path: root/usr.bin/script/script.c
diff options
context:
space:
mode:
authorliamjfoy <liamjfoy@NetBSD.org>2006-06-14 16:05:38 +0000
committerliamjfoy <liamjfoy@NetBSD.org>2006-06-14 16:05:38 +0000
commit4511d3297e9ee26fc8486a62a7caa4a42cebb6d3 (patch)
tree019e78a19845b36282bf46acd3114ec218a28528 /usr.bin/script/script.c
parenta697e6653a822fca23e2bba6cf4096df660eca0e (diff)
Fix PR: 26363: script core dumps on incorrect input files.
This patch virtually re-writes the playback code and contains improvements (mainly the dependency upon BUFSIZ being the same size as it was wrote at). OK: christos, joerg
Diffstat (limited to 'usr.bin/script/script.c')
-rw-r--r--usr.bin/script/script.c42
1 files changed, 33 insertions, 9 deletions
diff --git a/usr.bin/script/script.c b/usr.bin/script/script.c
index ba6f13b5057..f4d213f0bfd 100644
--- a/usr.bin/script/script.c
+++ b/usr.bin/script/script.c
@@ -1,4 +1,4 @@
-/* $NetBSD: script.c,v 1.11 2006/03/29 15:40:49 rpaulo Exp $ */
+/* $NetBSD: script.c,v 1.12 2006/06/14 16:05:38 liamjfoy Exp $ */
/*
* Copyright (c) 1980, 1992, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1992, 1993\n\
#if 0
static char sccsid[] = "@(#)script.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: script.c,v 1.11 2006/03/29 15:40:49 rpaulo Exp $");
+__RCSID("$NetBSD: script.c,v 1.12 2006/06/14 16:05:38 liamjfoy Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -47,6 +47,7 @@ __RCSID("$NetBSD: script.c,v 1.11 2006/03/29 15:40:49 rpaulo Exp $");
#include <sys/stat.h>
#include <sys/ioctl.h>
#include <sys/time.h>
+#include <sys/param.h>
#include <sys/uio.h>
#include <err.h>
@@ -63,6 +64,8 @@ __RCSID("$NetBSD: script.c,v 1.11 2006/03/29 15:40:49 rpaulo Exp $");
#include <unistd.h>
#include <util.h>
+#define DEF_BUF 65536
+
struct stamp {
uint64_t scr_len; /* amount of data */
uint64_t scr_sec; /* time it arrived in seconds... */
@@ -314,16 +317,26 @@ playback(FILE *fscript)
{
struct timespec tsi, tso;
struct stamp stamp;
- char buf[BUFSIZ];
+ struct stat playback_stat;
+ char buf[DEF_BUF];
+ off_t nread, save_len;
size_t l;
time_t clock;
- do {
+ if (fstat(fileno(fscript), &playback_stat) == -1)
+ err(1, "fstat failed");
+
+ for (nread = 0; nread < playback_stat.st_size; nread += save_len) {
if (fread(&stamp, sizeof(stamp), 1, fscript) != 1)
err(1, "reading playback header");
-
swapstamp(stamp);
- l = fread(buf, 1, stamp.scr_len, fscript);
+ save_len = sizeof(stamp);
+
+ if (stamp.scr_len >
+ (uint64_t)(playback_stat.st_size - save_len) - nread)
+ err(1, "invalid stamp");
+
+ save_len += stamp.scr_len;
clock = stamp.scr_sec;
tso.tv_sec = stamp.scr_sec;
tso.tv_nsec = stamp.scr_usec * 1000;
@@ -332,12 +345,15 @@ playback(FILE *fscript)
case 's':
(void)printf("Script started on %s", ctime(&clock));
tsi = tso;
+ fseek(fscript, stamp.scr_len, SEEK_CUR);
break;
case 'e':
(void)printf("\nScript done on %s", ctime(&clock));
+ fseek(fscript, stamp.scr_len, SEEK_CUR);
break;
case 'i':
/* throw input away */
+ fseek(fscript, stamp.scr_len, SEEK_CUR);
break;
case 'o':
tsi.tv_sec = tso.tv_sec - tsi.tv_sec;
@@ -349,11 +365,19 @@ playback(FILE *fscript)
if (usesleep)
(void)nanosleep(&tsi, NULL);
tsi = tso;
- (void)write(STDOUT_FILENO, buf, l);
+ while (stamp.scr_len > 0) {
+ l = MIN(DEF_BUF, stamp.scr_len);
+ if (fread(buf, sizeof(char), l, fscript) != l)
+ err(1, "cannot read buffer");
+
+ (void)write(STDOUT_FILENO, buf, l);
+ stamp.scr_len -= l;
+ }
break;
+ default:
+ err(1, "invalid direction");
}
- } while (stamp.scr_direction != 'e');
-
+ }
(void)fclose(fscript);
exit(0);
}