mirror of
https://git.tukaani.org/xz.git
synced 2024-04-04 12:36:23 +02:00
liblzma: Add NULL checks to LZMA and LZMA2 properties encoders.
Previously lzma_lzma_props_encode() and lzma_lzma2_props_encode() assumed that the options pointers must be non-NULL because the with these filters the API says it must never be NULL. It is good to do these checks anyway.
This commit is contained in:
parent
feb80ace86
commit
e20ce2b122
2 changed files with 6 additions and 0 deletions
|
@ -378,6 +378,9 @@ lzma_lzma2_encoder_memusage(const void *options)
|
||||||
extern lzma_ret
|
extern lzma_ret
|
||||||
lzma_lzma2_props_encode(const void *options, uint8_t *out)
|
lzma_lzma2_props_encode(const void *options, uint8_t *out)
|
||||||
{
|
{
|
||||||
|
if (options == NULL)
|
||||||
|
return LZMA_PROG_ERROR;
|
||||||
|
|
||||||
const lzma_options_lzma *const opt = options;
|
const lzma_options_lzma *const opt = options;
|
||||||
uint32_t d = my_max(opt->dict_size, LZMA_DICT_SIZE_MIN);
|
uint32_t d = my_max(opt->dict_size, LZMA_DICT_SIZE_MIN);
|
||||||
|
|
||||||
|
|
|
@ -658,6 +658,9 @@ lzma_lzma_lclppb_encode(const lzma_options_lzma *options, uint8_t *byte)
|
||||||
extern lzma_ret
|
extern lzma_ret
|
||||||
lzma_lzma_props_encode(const void *options, uint8_t *out)
|
lzma_lzma_props_encode(const void *options, uint8_t *out)
|
||||||
{
|
{
|
||||||
|
if (options == NULL)
|
||||||
|
return LZMA_PROG_ERROR;
|
||||||
|
|
||||||
const lzma_options_lzma *const opt = options;
|
const lzma_options_lzma *const opt = options;
|
||||||
|
|
||||||
if (lzma_lzma_lclppb_encode(opt, out))
|
if (lzma_lzma_lclppb_encode(opt, out))
|
||||||
|
|
Loading…
Reference in a new issue