diff options
| author | David Goulet <dgoulet@torproject.org> | 2023-01-25 14:13:35 -0500 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2023-01-25 14:13:35 -0500 |
| commit | 7b87ecf7e2a789c742743aeff94550adb971edb5 (patch) | |
| tree | e7828be16601adc375b6d82f5ecb279f547b32e0 /src | |
| parent | fa2face3b592d8e09068b64803ee4974921429bc (diff) | |
| parent | a1d3d201aeeb1360f5b34497040e908d932f65d9 (diff) | |
| download | tor-7b87ecf7e2a789c742743aeff94550adb971edb5.tar.gz tor-7b87ecf7e2a789c742743aeff94550adb971edb5.zip | |
Merge branch 'maint-0.4.5' into maint-0.4.7
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/compress/compress_lzma.c | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/src/lib/compress/compress_lzma.c b/src/lib/compress/compress_lzma.c index 7e5c1a2883..6ae8fd8109 100644 --- a/src/lib/compress/compress_lzma.c +++ b/src/lib/compress/compress_lzma.c @@ -73,6 +73,23 @@ lzma_error_str(lzma_ret error) return "Unable to progress"; case LZMA_PROG_ERROR: return "Programming error"; +#if LZMA_VERSION >= 50030010 + case LZMA_SEEK_NEEDED: + // This can be returned by the .xz file_info decoder but with + // lzma_alone_decoder/encoder as we use, it should never be seen. + return "Seek needed"; +#endif +#if LZMA_VERSION >= 50030020 + case LZMA_RET_INTERNAL1: + case LZMA_RET_INTERNAL2: + case LZMA_RET_INTERNAL3: + case LZMA_RET_INTERNAL4: + case LZMA_RET_INTERNAL5: + case LZMA_RET_INTERNAL6: + case LZMA_RET_INTERNAL7: + case LZMA_RET_INTERNAL8: + FALLTHROUGH; +#endif default: return "Unknown LZMA error"; } @@ -306,6 +323,19 @@ tor_lzma_compress_process(tor_lzma_compress_state_t *state, case LZMA_OPTIONS_ERROR: case LZMA_DATA_ERROR: case LZMA_PROG_ERROR: +#if LZMA_VERSION >= 50030010 + case LZMA_SEEK_NEEDED: +#endif +#if LZMA_VERSION >= 50030020 + case LZMA_RET_INTERNAL1: + case LZMA_RET_INTERNAL2: + case LZMA_RET_INTERNAL3: + case LZMA_RET_INTERNAL4: + case LZMA_RET_INTERNAL5: + case LZMA_RET_INTERNAL6: + case LZMA_RET_INTERNAL7: + case LZMA_RET_INTERNAL8: +#endif default: log_warn(LD_GENERAL, "LZMA %s didn't finish: %s.", state->compress ? "compression" : "decompression", |