d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refine the error-checking and reporting in the

Browse Source 
"compress" format decompression code.  In particular,
distinguish between EOF and fatal data errors.
This commit is contained in:
Tim Kientzle 2004-10-17 23:40:10 +00:00
parent cc11275dd4
commit 5255e61f1a
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/libarchive/archive_read_support_compression_compress.c
View File

@ -295,8 +295,10 @@ read_ahead(struct archive *a, const void **p, size_t min)
read_avail++; read_avail++;
} else { } else {
ret = next_code(a, state); ret = next_code(a, state);
if (ret) if (ret == ARCHIVE_EOF)
state->end_of_stream = ret; state->end_of_stream = ret;
else if (ret != ARCHIVE_OK)
return (ret);
} }
} }
} }
@ -346,7 +348,8 @@ finish(struct archive *a)
/* /*
* Process the next code and fill the stack with the expansion * Process the next code and fill the stack with the expansion
* of the code. Returns TRUE if we hit the end of the data. * of the code. Returns ARCHIVE_FATAL if there is a fatal I/O or
* format error, ARCHIVE_EOF if we hit end of data, ARCHIVE_OK otherwise.
*/ */
static int static int
next_code(struct archive *a, struct private_data *state) next_code(struct archive *a, struct private_data *state)
@ -391,9 +394,11 @@ next_code(struct archive *a, struct private_data *state)
return (next_code(a, state)); return (next_code(a, state));
} }
if (code > state->free_ent) if (code > state->free_ent) {
/* XXX invalid code? This is fatal. XXX */ /* An invalid code is a fatal error. */
return (1); archive_set_error(a, -1, "Invalid compressed data");
return (ARCHIVE_FATAL);
}
/* Special case for KwKwK string. */ /* Special case for KwKwK string. */
if (code >= state->free_ent) { if (code >= state->free_ent) {
@ -426,7 +431,7 @@ next_code(struct archive *a, struct private_data *state)
/* Remember previous code. */ /* Remember previous code. */
state->oldcode = newcode; state->oldcode = newcode;
return (0); return (ARCHIVE_OK);
} }
/* /*