Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-05 16:18:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Disable more libmagic builtin checks that override the magic database.

Browse source
This commit is contained in:
Jon Siwek 2013-07-09 15:55:33 -05:00
parent 6a5b825058
commit da4a0bed03
2 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/util.cc
View file

@ -1578,7 +1578,7 @@ void bro_init_magic(magic_t* cookie_ptr, int flags)
if ( ! cookie_ptr || *cookie_ptr ) if ( ! cookie_ptr || *cookie_ptr )
return; return;
*cookie_ptr = magic_open(flags|MAGIC_NO_CHECK_TOKENS); *cookie_ptr = magic_open(flags|DISABLE_LIBMAGIC_BUILTIN_CHECKS);
// Use our custom database for mime types, but the default database // Use our custom database for mime types, but the default database
// from libmagic for the verbose file type. // from libmagic for the verbose file type.

17
src/util.h
View file

@ -377,6 +377,23 @@ struct CompareString
} }
}; };
// Older versions of libmagic may not define the MAGIC_NO_CHECK_BUILTIN
// convenience macro and other newer versions seem to have a typo that makes
// it unusable, so just make a different one now with all known flags for
// builtin libmagic components that should be disabled so that Bro only
// uses the custom magic database shipped with it.
#define DISABLE_LIBMAGIC_BUILTIN_CHECKS ( \
MAGIC_NO_CHECK_COMPRESS | \
MAGIC_NO_CHECK_TAR | \
/* MAGIC_NO_CHECK_SOFT | */ \
MAGIC_NO_CHECK_APPTYPE | \
MAGIC_NO_CHECK_ELF | \
MAGIC_NO_CHECK_TEXT | \
MAGIC_NO_CHECK_CDF | \
MAGIC_NO_CHECK_TOKENS | \
MAGIC_NO_CHECK_ENCODING \
)
extern magic_t magic_desc_cookie; extern magic_t magic_desc_cookie;
extern magic_t magic_mime_cookie; extern magic_t magic_mime_cookie;