Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2024-09-24 11:38:26 +02:00
Code Releases Wiki Activity

fix: Crash due to libmagic bug when using MAGIC_COMPRESS with magic_buffer

Browse Source 
#1529
This commit is contained in:
WerWolv 2024-02-02 23:22:25 +01:00
parent a80f9e9ca7
commit e864c1aaac
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libimhex/source/helpers/magic.cpp
View File

@ -101,7 +101,7 @@ namespace hex::magic {
auto magicFiles = getMagicFiles();
if (magicFiles.has_value()) {
magic_t ctx = magic_open(MAGIC_COMPRESS | (firstEntryOnly ? MAGIC_NONE : MAGIC_CONTINUE));
magic_t ctx = magic_open(firstEntryOnly ? MAGIC_NONE : MAGIC_CONTINUE);
ON_SCOPE_EXIT { magic_close(ctx); };
if (magic_load(ctx, magicFiles->c_str()) == 0) {
@ -126,7 +126,7 @@ namespace hex::magic {
auto magicFiles = getMagicFiles();
if (magicFiles.has_value()) {
magic_t ctx = magic_open(MAGIC_COMPRESS | MAGIC_MIME_TYPE | (firstEntryOnly ? MAGIC_NONE : MAGIC_CONTINUE));
magic_t ctx = magic_open(MAGIC_MIME_TYPE | (firstEntryOnly ? MAGIC_NONE : MAGIC_CONTINUE));
ON_SCOPE_EXIT { magic_close(ctx); };
if (magic_load(ctx, magicFiles->c_str()) == 0) {