ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1361 from ZoneMinder/fix_coverity_issues 

Fix coverity issues
This commit is contained in:
Andrew Bauer 2016-03-26 21:11:28 -05:00
parent e717349116 a16c1746e5
commit ffc0ebaf22
5 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/zm_event.cpp
View File

@ -119,13 +119,16 @@ Event::Event( Monitor *p_monitor, struct timeval p_start_time, const std::string
struct stat statbuf;
errno = 0;
stat( path, &statbuf );
if ( errno == ENOENT || errno == ENOTDIR )
{
if ( mkdir( path, 0755 ) )
{
Fatal( "Can't mkdir %s: %s", path, strerror(errno));
}
if ( stat( path, &statbuf ) ) {
if ( errno == ENOENT || errno == ENOTDIR )
{
if ( mkdir( path, 0755 ) )
{
Fatal( "Can't mkdir %s: %s", path, strerror(errno));
}
} else {
Warning( "Error stat'ing %s, may be fatal. error is %s", path, strerror(errno));
}
}
if ( i == 2 )
strncpy( date_path, path, sizeof(date_path) );

6
src/zm_monitor.cpp
View File

@ -342,10 +342,10 @@ Monitor::Monitor(
images( 0 ),
privacy_bitmask( NULL )
{
strncpy( name, p_name, sizeof(name) );
strncpy( name, p_name, sizeof(name)-1 );
strncpy( event_prefix, p_event_prefix, sizeof(event_prefix) );
strncpy( label_format, p_label_format, sizeof(label_format) );
strncpy( event_prefix, p_event_prefix, sizeof(event_prefix)-1 );
strncpy( label_format, p_label_format, sizeof(label_format)-1 );
// Change \n to actual line feeds
char *token_ptr = label_format;

3
src/zm_monitor.h
View File

@ -301,9 +301,6 @@ protected:
const unsigned char *privacy_bitmask;
int iDoNativeMotDet;
int n_linked_monitors;
MonitorLink **linked_monitors;

2
src/zm_rtsp_auth.cpp
View File

@ -201,8 +201,8 @@ std::string Authenticator::computeDigestResponse(std::string &method, std::strin
return md5HexBuf;
#else // HAVE_DECL_MD5
Error( "You need to build with gnutls or openssl installed to use digest authentication" );
#endif // HAVE_DECL_MD5
return( 0 );
#endif // HAVE_DECL_MD5
}
void Authenticator::checkAuthResponse(std::string &response) {

7
src/zm_stream.cpp
View File

@ -294,7 +294,12 @@ void StreamBase::openComms()
snprintf( sock_path_lock, sizeof(sock_path_lock), "%s/zms-%06d.lock", config.path_socks, connkey);
lock_fd = open(sock_path_lock, O_CREAT|O_WRONLY, S_IRUSR | S_IWUSR);
if (lock_fd <= 0 || flock(lock_fd, LOCK_EX) != 0)
if ( lock_fd <= 0 )
{
Error("Unable to open sock lock file %s: %s", sock_path_lock, strerror(errno) );
lock_fd = 0;
}
else if ( flock(lock_fd, LOCK_EX) != 0 )
{
Error("Unable to lock sock lock file %s: %s", sock_path_lock, strerror(errno) );