From 89b8d4ea4ea3c1da66c1e3fd6ad21aef3ca349bd Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 8 Apr 2022 19:34:20 -0700 Subject: [PATCH] try to actually fix null pointer deref Signed-off-by: Rosen Penev --- src/makernote_int.cpp | 6 +++--- src/version.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/makernote_int.cpp b/src/makernote_int.cpp index 67c736b1e9..f8728c9f7d 100644 --- a/src/makernote_int.cpp +++ b/src/makernote_int.cpp @@ -142,10 +142,10 @@ TiffComponent* TiffMnCreator::create(uint16_t tag, IfdId group, const std::strin TiffComponent* TiffMnCreator::create(uint16_t tag, IfdId group, IfdId mnGroup) { auto tmr = std::find(std::begin(registry_), std::end(registry_), mnGroup); if (tmr != std::end(registry_)) { - if (!tmr->newMnFct2_) { - std::cout << "mnGroup = " << mnGroup << "\n"; + if (tmr->newMnFct2_) { + return tmr->newMnFct2_(tag, group, mnGroup); } - return tmr->newMnFct2_(tag, group, mnGroup); + std::cout << "mnGroup = " << mnGroup << "\n"; } return nullptr; } // TiffMnCreator::create diff --git a/src/version.cpp b/src/version.cpp index 983771da7c..b3f65f18c3 100644 --- a/src/version.cpp +++ b/src/version.cpp @@ -123,10 +123,10 @@ static std::vector getLoadedLibraries() { // enumerate loaded libraries and determine path to executable HMODULE handles[200]; DWORD cbNeeded; - if (EnumProcessModules(GetCurrentProcess(), handles, std::size(handles), &cbNeeded)) { + if (EnumProcessModules(GetCurrentProcess(), handles, DWORD(std::size(handles)), &cbNeeded)) { char szFilename[_MAX_PATH]; for (DWORD h = 0; h < cbNeeded / sizeof(handles[0]); h++) { - GetModuleFileNameA(handles[h], szFilename, std::size(szFilename)); + GetModuleFileNameA(handles[h], szFilename, DWORD(std::size(szFilename))); std::string path(szFilename); pushPath(path, libs, paths); }