upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-15 11:39:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

improve error handling for corrupt database

Browse source
This commit is contained in:
Wolfram Schneider 2022-01-30 18:04:52 +00:00
parent 5260fbcebd
commit 33ee87fa0a
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
usr.bin/locate/locate/fastfind.c
View file

@ -67,7 +67,7 @@ statistic (fp, path_fcodes)
} else
count += c - OFFSET;
if (count < 0 || count > MAXPATHLEN) {
if (count < 0 || count >= MAXPATHLEN) {
/* stop on error and display the statstics anyway */
warnx("corrupted database: %s", path_fcodes);
error = 1;
@ -155,7 +155,7 @@ fastfind
register int c, cc;
int count, found, globflag;
u_char *cutoff;
u_char bigram1[NBG], bigram2[NBG], path[MAXPATHLEN];
u_char bigram1[NBG], bigram2[NBG], path[MAXPATHLEN + 2];
#ifdef FF_ICASE
/* use a lookup table for case insensitive search */
@ -206,7 +206,9 @@ fastfind
foundchar = 0;
#ifdef FF_MMAP
c = (u_char)*paddr++; len--;
c = (u_char)*paddr++;
len--;
for (; len > 0; ) {
#else
c = getc(fp);
@ -216,8 +218,12 @@ fastfind
/* go forward or backward */
if (c == SWITCH) { /* big step, an integer */
#ifdef FF_MMAP
if (len < sizeof(int))
errx(1, "corrupted database: %s", database);
count += getwm(paddr) - OFFSET;
len -= INTSIZE; paddr += INTSIZE;
len -= INTSIZE;
paddr += INTSIZE;
#else
count += getwf(fp) - OFFSET;
#endif /* FF_MMAP */
@ -225,8 +231,9 @@ fastfind
count += c - OFFSET;
}
if (count < 0 || count > MAXPATHLEN)
errx(1, "corrupted database: %s", database);
if (count < 0 || count >= MAXPATHLEN)
errx(1, "corrupted database: %s %d", database, count);
/* overlay old path */
p = path + count;
foundchar = p - 1;
@ -285,6 +292,10 @@ fastfind
*p++ = bigram1[c];
*p++ = bigram2[c];
}
if (p - path >= MAXPATHLEN)
errx(1, "corrupted database: %s", database);
}
if (found) { /* previous line matched */