From 6364cbc63ed82508c10d78cea4443f77e6e38cfb Mon Sep 17 00:00:00 2001 From: Lasse Collin Date: Mon, 22 Apr 2024 21:54:39 +0300 Subject: [PATCH] liblzma: lzma_str_to_filters: Set *error_pos on all errors The API docs clearly say that if error_pos isn't NULL then *error is always set on any error. However, it wasn't touched if str == NULL or filters == NULL or unsupported flags were specified. Fixes: cedeeca2ea6ada5b0411b2ae10d7a859e837f203 (cherry picked from commit 70d12dd069bb9bb0d6bb1c8fafc4e6f77780263d) --- src/liblzma/common/string_conversion.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/liblzma/common/string_conversion.c b/src/liblzma/common/string_conversion.c index 92ad4a07..73e7ae3a 100644 --- a/src/liblzma/common/string_conversion.c +++ b/src/liblzma/common/string_conversion.c @@ -996,6 +996,12 @@ extern LZMA_API(const char *) lzma_str_to_filters(const char *str, int *error_pos, lzma_filter *filters, uint32_t flags, const lzma_allocator *allocator) { + // If error_pos isn't NULL, *error_pos must always be set. + // liblzma <= 5.4.6 and <= 5.6.1 have a bug and don't do this + // when str == NULL or filters == NULL or flags are unsupported. + if (error_pos != NULL) + *error_pos = 0; + if (str == NULL || filters == NULL) return "Unexpected NULL pointer argument(s) " "to lzma_str_to_filters()";