mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-05-18 11:35:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix possible not null-terminated strncpy. Wouldn't actually happen because we are copying from the db field which is 1 smaller than the variable but Coverity doesn't know that.

Browse Source
This commit is contained in:
Isaac Connor
2017-12-12 11:48:12 -05:00
parent 56ace524ff
commit 819c2e5190
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/zm_storage.cpp
View File

@@ -34,15 +34,15 @@ Storage::Storage() {
// not using an absolute path. Make it one by appending ZM_PATH_WEB
snprintf( path, sizeof (path), "%s/%s", staticConfig.PATH_WEB.c_str( ), staticConfig.DIR_EVENTS.c_str() );
} else {
strncpy(path, staticConfig.DIR_EVENTS.c_str(), sizeof(path) );
strncpy(path, staticConfig.DIR_EVENTS.c_str(), sizeof(path)-1 );
}
}
Storage::Storage( MYSQL_ROW &dbrow ) {
unsigned int index = 0;
id = atoi( dbrow[index++] );
strncpy( name, dbrow[index++], sizeof(name) );
strncpy( path, dbrow[index++], sizeof(path) );
strncpy( name, dbrow[index++], sizeof(name)-1 );
strncpy( path, dbrow[index++], sizeof(path)-1 );
}
/* If a zero or invalid p_id is passed, then the old default path will be assumed. */
@@ -69,7 +69,7 @@ Storage::Storage( unsigned int p_id ) {
// not using an absolute path. Make it one by appending ZM_PATH_WEB
snprintf( path, sizeof (path), "%s/%s", staticConfig.PATH_WEB.c_str( ), staticConfig.DIR_EVENTS.c_str() );
} else {
strncpy(path, staticConfig.DIR_EVENTS.c_str(), sizeof(path) );
strncpy(path, staticConfig.DIR_EVENTS.c_str(), sizeof(path)-1 );
}
Debug(1,"No id passed to Storage constructor. Using default path %s instead", path );
strcpy(name, "Default");