cuberite/SQLiteCpp
1
0
Fork 0
mirror of https://github.com/cuberite/SQLiteCpp.git synced 2025-08-04 17:56:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix Database::getHeaderInfo() for case where the file is not even 100 bytes long

Browse Source
This commit is contained in:
Sébastien Rombauts 2020-01-04 18:54:27 +01:00
parent 5a1fa743e5
commit 55de873f66
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/Database.cpp
View File

@ -287,28 +287,32 @@ Header Database::getHeaderInfo(const std::string& aFilename)
if (aFilename.empty()) if (aFilename.empty())
{ {
throw SQLite::Exception("Could not open database, the aFilename parameter was empty."); throw SQLite::Exception("Filename parameter is empty");
} }
std::ifstream fileBuffer(aFilename.c_str(), std::ios::in | std::ios::binary);
if (fileBuffer.is_open())
{ {
fileBuffer.seekg(0, std::ios::beg); std::ifstream fileBuffer(aFilename.c_str(), std::ios::in | std::ios::binary);
fileBuffer.read(pBuf, 100); if (fileBuffer.is_open())
fileBuffer.close(); {
strncpy(pHeaderStr, pBuf, 16); fileBuffer.seekg(0, std::ios::beg);
} fileBuffer.read(pBuf, 100);
fileBuffer.close();
else if (fileBuffer.gcount() < 100)
{ {
throw SQLite::Exception("Error opening file: " + aFilename); throw SQLite::Exception("File " + aFilename + " is too short");
}
}
else
{
throw SQLite::Exception("Error opening file " + aFilename);
}
} }
// If the "magic string" can't be found then header is invalid, corrupt or unreadable // If the "magic string" can't be found then header is invalid, corrupt or unreadable
strncpy(pHeaderStr, pBuf, 16);
if (!strncmp(pHeaderStr, "SQLite format 3", 15) == 0) if (!strncmp(pHeaderStr, "SQLite format 3", 15) == 0)
{ {
throw SQLite::Exception("Invalid or encrypted SQLite header"); throw SQLite::Exception("Invalid or encrypted SQLite header in file " + aFilename);
} }
h.pageSizeBytes = (buf[16] << 8) | buf[17]; h.pageSizeBytes = (buf[16] << 8) | buf[17];