1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
|
$NetBSD: patch-al,v 1.5 2007/01/08 08:50:51 rillig Exp $
Security fix for CAN-2005-3001 and CVE-2006-4810
--- util/texindex.c.orig 2004-04-11 19:56:47.000000000 +0200
+++ util/texindex.c 2007-01-08 09:41:42.000000000 +0100
@@ -387,14 +387,15 @@ For more information about these matters
/* Return a name for temporary file COUNT. */
static char *
-maketempname (int count)
+maketempname (int count, int can_exist)
{
static char *tempbase = NULL;
+ char *tempname;
char tempsuffix[10];
+ int fd;
if (!tempbase)
{
- int fd;
tempbase = concat (tempdir, "txidxXXXXXX");
fd = mkstemp (tempbase);
@@ -403,7 +404,14 @@ maketempname (int count)
}
sprintf (tempsuffix, ".%d", count);
- return concat (tempbase, tempsuffix);
+ tempname = concat (tempbase, tempsuffix);
+ if (!can_exist) {
+ fd = open (tempname, O_CREAT|O_EXCL|O_WRONLY, 0600);
+ if (fd == -1)
+ pfatal_with_name (tempname);
+ close (fd);
+ }
+ return tempname;
}
@@ -415,7 +423,7 @@ flush_tempfiles (int to_count)
if (keep_tempfiles)
return;
while (last_deleted_tempcount < to_count)
- unlink (maketempname (++last_deleted_tempcount));
+ unlink (maketempname (++last_deleted_tempcount, 1));
}
@@ -837,7 +845,7 @@ readline (struct linebuffer *linebuffer,
{
buffer = (char *) xrealloc (buffer, linebuffer->size *= 2);
p += buffer - linebuffer->buffer;
- end += buffer - linebuffer->buffer;
+ end = buffer + linebuffer->size;
linebuffer->buffer = buffer;
}
if (c < 0 || c == '\n')
@@ -882,7 +890,7 @@ sort_offline (char *infile, off_t total,
for (i = 0; i < ntemps; i++)
{
- char *outname = maketempname (++tempcount);
+ char *outname = maketempname (++tempcount, 0);
FILE *ostream = fopen (outname, "w");
long tempsize = 0;
@@ -930,7 +938,7 @@ fail:
for (i = 0; i < ntemps; i++)
{
- char *newtemp = maketempname (++tempcount);
+ char *newtemp = maketempname (++tempcount, 0);
sort_in_core (tempfiles[i], MAX_IN_CORE_SORT, newtemp);
if (!keep_tempfiles)
unlink (tempfiles[i]);
@@ -1400,7 +1408,7 @@ merge_files (char **infiles, int nfiles,
int nf = MAX_DIRECT_MERGE;
if (i + 1 == ntemps)
nf = nfiles - i * MAX_DIRECT_MERGE;
- tempfiles[i] = maketempname (++tempcount);
+ tempfiles[i] = maketempname (++tempcount, 0);
value |= merge_direct (&infiles[i * MAX_DIRECT_MERGE], nf, tempfiles[i]);
}
|
