nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'ahf/bugs/21665'

Browse Source
This commit is contained in:
Nick Mathewson 2017-05-01 14:22:49 -04:00
commit 4837421d7c
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/compress.c
View File

@ -255,8 +255,8 @@ detect_compression_method(const char *in, size_t in_len)
} else if (in_len > 2 && (in[0] & 0x0f) == 8 &&
(ntohs(get_uint16(in)) % 31) == 0) {
return ZLIB_METHOD;
} else if (in_len > 3 &&
fast_memeq(in, "\x5d\x00\x00\x00", 4)) {
} else if (in_len > 2 &&
fast_memeq(in, "\x5d\x00\x00", 3)) {
return LZMA_METHOD;
} else if (in_len > 3 &&
fast_memeq(in, "\x28\xb5\x2f\xfd", 4)) {

13
src/common/compress_lzma.c
View File

@ -22,6 +22,9 @@
#include <lzma.h>
#endif
/** The maximum amount of memory we allow the LZMA decoder to use, in bytes. */
#define MEMORY_LIMIT (16 * 1024 * 1024)
/** Total number of bytes allocated for LZMA state. */
static atomic_counter_t total_lzma_allocation;
@ -33,9 +36,9 @@ memory_level(compression_level_t level)
switch (level) {
default:
case BEST_COMPRESSION:
case HIGH_COMPRESSION: return 9;
case MEDIUM_COMPRESSION: return 6;
case LOW_COMPRESSION: return 3;
case HIGH_COMPRESSION: return 6;
case MEDIUM_COMPRESSION: return 4;
case LOW_COMPRESSION: return 2;
}
}
@ -191,9 +194,7 @@ tor_lzma_compress_new(int compress,
goto err;
}
} else {
// FIXME(ahf): This should be something more sensible than
// UINT64_MAX: See #21665.
retval = lzma_alone_decoder(&result->stream, UINT64_MAX);
retval = lzma_alone_decoder(&result->stream, MEMORY_LIMIT);
if (retval != LZMA_OK) {
log_warn(LD_GENERAL, "Error from LZMA decoder: %s (%u).",