diff options
author | des <des@FreeBSD.org> | 2006-03-23 14:09:21 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2006-03-23 14:09:21 +0000 |
commit | ec17f7788515f838ae8c595748fbd664f1e2f1f1 (patch) | |
tree | 297104a1ee790469dfe9ff88a857a9836926bccc /lib/libz/inffast.c | |
parent | 6d9b0264a175d883795d7a2549ca6f2d9c2a15b7 (diff) | |
download | FreeBSD-src-ec17f7788515f838ae8c595748fbd664f1e2f1f1.zip FreeBSD-src-ec17f7788515f838ae8c595748fbd664f1e2f1f1.tar.gz |
Resolve conflicts.
Diffstat (limited to 'lib/libz/inffast.c')
-rw-r--r-- | lib/libz/inffast.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/lib/libz/inffast.c b/lib/libz/inffast.c index 8c02a17..bbee92e 100644 --- a/lib/libz/inffast.c +++ b/lib/libz/inffast.c @@ -74,6 +74,9 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ unsigned char FAR *out; /* local strm->next_out */ unsigned char FAR *beg; /* inflate()'s initial strm->next_out */ unsigned char FAR *end; /* while out < end, enough space available */ +#ifdef INFLATE_STRICT + unsigned dmax; /* maximum distance from zlib header */ +#endif unsigned wsize; /* window size or zero if not using window */ unsigned whave; /* valid bytes in the window */ unsigned write; /* window write index */ @@ -98,6 +101,9 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ out = strm->next_out - OFF; beg = out - (start - strm->avail_out); end = out + (strm->avail_out - 257); +#ifdef INFLATE_STRICT + dmax = state->dmax; +#endif wsize = state->wsize; whave = state->whave; write = state->write; @@ -167,6 +173,13 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */ } } dist += (unsigned)hold & ((1U << op) - 1); +#ifdef INFLATE_STRICT + if (dist > dmax) { + strm->msg = (char *)"invalid distance too far back"; + state->mode = BAD; + break; + } +#endif hold >>= op; bits -= op; Tracevv((stderr, "inflate: distance %u\n", dist)); |