root
/
xz
mirror of https://git.tukaani.org/xz.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Check for LZMA_FILTER_RESERVED_START in filter_flags_encoder.c. 

Use LZMA_PROG_ERROR instead of LZMA_HEADER_ERROR if the Filter ID
is in the reserved range. This allows Block Header encoder to
detect unallowed Filter IDs, which is good for Stream encoder.
This commit is contained in:
Lasse Collin 2008-09-10 17:02:00 +03:00
parent 123ab0acec
commit cb072b7c84
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/liblzma/common/filter_flags_encoder.c
View File

@ -23,10 +23,11 @@
extern LZMA_API lzma_ret extern LZMA_API lzma_ret
lzma_filter_flags_size(uint32_t *size, const lzma_filter *filter) lzma_filter_flags_size(uint32_t *size, const lzma_filter *filter)
{ {
if (filter->id >= LZMA_FILTER_RESERVED_START)
return LZMA_PROG_ERROR;
return_if_error(lzma_properties_size(size, filter)); return_if_error(lzma_properties_size(size, filter));
// lzma_properties_size() validates the Filter ID as a side-effect,
// so we know that it is a valid VLI.
*size += lzma_vli_size(filter->id) + lzma_vli_size(*size); *size += lzma_vli_size(filter->id) + lzma_vli_size(*size);
return LZMA_OK; return LZMA_OK;
@ -39,7 +40,7 @@ lzma_filter_flags_encode(const lzma_filter *filter,
{ {
// Filter ID // Filter ID
if (filter->id >= LZMA_FILTER_RESERVED_START) if (filter->id >= LZMA_FILTER_RESERVED_START)
return LZMA_HEADER_ERROR; return LZMA_PROG_ERROR;
return_if_error(lzma_vli_encode(filter->id, NULL, return_if_error(lzma_vli_encode(filter->id, NULL,
out, out_pos, out_size)); out, out_pos, out_size));