Rooba
/
ImHex
mirror of https://github.com/WerWolv/ImHex.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix crash if no magic folder is present

This commit is contained in:
WerWolv 2020-11-12 23:08:17 +01:00
parent 8172cf28db
commit 86fdd531da
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
source/views/view_information.cpp
View File

@ -83,35 +83,40 @@ namespace hex {
std::string magicFiles; std::string magicFiles;
for (const auto &entry : std::filesystem::directory_iterator("magic")) { std::error_code error;
for (const auto &entry : std::filesystem::directory_iterator("magic", error)) {
if (entry.is_regular_file() && entry.path().extension() == ".mgc") if (entry.is_regular_file() && entry.path().extension() == ".mgc")
magicFiles += entry.path().string() + MAGIC_PATH_SEPARATOR; magicFiles += entry.path().string() + MAGIC_PATH_SEPARATOR;
} }
magicFiles.pop_back();
{ if (!error) {
magic_t cookie = magic_open(MAGIC_NONE); magicFiles.pop_back();
if (magic_load(cookie, magicFiles.c_str()) == -1)
{
magic_t cookie = magic_open(MAGIC_NONE);
if (magic_load(cookie, magicFiles.c_str()) == -1)
goto skip_description; goto skip_description;
this->m_fileDescription = magic_buffer(cookie, buffer.data(), buffer.size()); this->m_fileDescription = magic_buffer(cookie, buffer.data(), buffer.size());
skip_description: skip_description:
magic_close(cookie); magic_close(cookie);
} }
{ {
magic_t cookie = magic_open(MAGIC_MIME); magic_t cookie = magic_open(MAGIC_MIME);
if (magic_load(cookie, magicFiles.c_str()) == -1) if (magic_load(cookie, magicFiles.c_str()) == -1)
goto skip_mime; goto skip_mime;
this->m_mimeType = magic_buffer(cookie, buffer.data(), buffer.size()); this->m_mimeType = magic_buffer(cookie, buffer.data(), buffer.size());
skip_mime: skip_mime:
magic_close(cookie);
}
magic_close(cookie);
} }