open-dsi
/
clamav
mirror of https://github.com/Cisco-Talos/clamav
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Disabling LZMA decompression for EGG archives, because it currently fails with an error message that isn't very user friendly.

Browse Source
pull/111/head
Micah Snyder 6 years ago
parent b53bf13b00
commit 8d30642000
1 changed files with 30 additions and 28 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 58
      libclamav/egg.c

58
libclamav/egg.c
Unescape View File

@ -2664,34 +2664,36 @@ cl_egg_error_t cli_egg_extract_file(void* hArchive, const char** filename, const
//break;
}
case BLOCK_HEADER_COMPRESS_ALGORITHM_LZMA: {
char* decompressed_block = NULL;
size_t decompressed_block_size = 0;
if (EGG_OK != cli_egg_lzma_decompress(currBlock->compressedData,
currBlock->blockHeader->compress_size,
&decompressed_block,
&decompressed_block_size)) {
/* Failed to decompress block */
cli_warnmsg("Failed to decompress LZMA compressed block\n");
goto done;
}
/* Decompressed block. Add it to the file data */
decompressed = cli_realloc(decompressed, (size_t)decompressed_size + decompressed_block_size);
if (NULL == decompressed) {
cli_errmsg("cli_egg_extract_file: Failed to allocate %llu bytes for decompressed file!\n",
decompressed_size);
free(decompressed_block);
status = EGG_EMEM;
goto done;
}
memcpy(decompressed + decompressed_size, decompressed_block, decompressed_block_size);
decompressed_size += decompressed_block_size;
free(decompressed_block);
retval = EGG_OK;
break;
cli_warnmsg("cli_egg_extract_file: LZMA decompression not yet supported.\n");
goto done;
// char* decompressed_block = NULL;
// size_t decompressed_block_size = 0;
// if (EGG_OK != cli_egg_lzma_decompress(currBlock->compressedData,
// currBlock->blockHeader->compress_size,
// &decompressed_block,
// &decompressed_block_size)) {
// /* Failed to decompress block */
// cli_warnmsg("Failed to decompress LZMA compressed block\n");
// goto done;
// }
// /* Decompressed block. Add it to the file data */
// decompressed = cli_realloc(decompressed, (size_t)decompressed_size + decompressed_block_size);
// if (NULL == decompressed) {
// cli_errmsg("cli_egg_extract_file: Failed to allocate %llu bytes for decompressed file!\n",
// decompressed_size);
// free(decompressed_block);
// status = EGG_EMEM;
// goto done;
// }
// memcpy(decompressed + decompressed_size, decompressed_block, decompressed_block_size);
// decompressed_size += decompressed_block_size;
// free(decompressed_block);
// retval = EGG_OK;
// break;
}
default: {
cli_errmsg("cli_egg_extract_file: unknown compression algorithm: %d!\n",

Write Preview
Loading…
Cancel
Save