third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

try to actually fix null pointer deref

Browse Source 
Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev
2022-04-08 19:34:20 -07:00
parent 25ef5d7e77
commit 89b8d4ea4e
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/makernote_int.cpp
+3 -3
View File
@@ -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
src/version.cpp
+2 -2
View File
@@ -123,10 +123,10 @@ static std::vector<std::string> 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);
}