Merge pull request #308 Fix build warning due to string truncation from stauffer-garmin/master

SRombauts · web-flow · commit 721b245045aa · 2020-11-18T08:36:34.000+01:00
diff --git a/src/Database.cpp b/src/Database.cpp
@@ -310,7 +310,8 @@ Header Database::getHeaderInfo(const std::string& aFilename)
     }
 
     // If the "magic string" can't be found then header is invalid, corrupt or unreadable
-    strncpy(pHeaderStr, pBuf, 16);
+    memcpy(pHeaderStr, pBuf, 16);
+    pHeaderStr[15] = '\0';
     if (strncmp(pHeaderStr, "SQLite format 3", 15) != 0)
     {
         throw SQLite::Exception("Invalid or encrypted SQLite header in file " + aFilename);

Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,8 @@ Header Database::getHeaderInfo(const std::string& aFilename)`
`310`	`310`	`}`
`311`	`311`
`312`	`312`	`// If the "magic string" can't be found then header is invalid, corrupt or unreadable`
`313`		`- strncpy(pHeaderStr, pBuf, 16);`
	`313`	`+ memcpy(pHeaderStr, pBuf, 16);`
	`314`	`+ pHeaderStr[15] = '\0';`
`314`	`315`	`if (strncmp(pHeaderStr, "SQLite format 3", 15) != 0)`
`315`	`316`	`{`
`316`	`317`	`throw SQLite::Exception("Invalid or encrypted SQLite header in file " + aFilename);`