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

Convert use of char path[PATH_MAX] to std::string. Fixes potential overflows, quiets compile, should reduce ram quite a bit and might event be faster. Code is also more readable.

This commit is contained in:
Isaac Connor 2020-07-21 16:16:16 -04:00
parent 2eec85eaff
commit f593261136
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/zm_event.h
View File

@ -89,15 +89,17 @@ class Event {
bool alarm_frame_written; bool alarm_frame_written;
unsigned int tot_score; unsigned int tot_score;
unsigned int max_score; unsigned int max_score;
char path[PATH_MAX]; std::string path;
char snapshot_file[PATH_MAX]; std::string snapshot_file;
char alarm_file[PATH_MAX]; std::string alarm_file;
VideoWriter* videowriter; VideoWriter* videowriter;
FILE* timecodes_fd; FILE* timecodes_fd;
char video_name[PATH_MAX]; std::string video_name;
char video_file[PATH_MAX]; std::string video_file;
char timecodes_name[PATH_MAX];
char timecodes_file[PATH_MAX]; std::string timecodes_name;
std::string timecodes_file;
int last_db_frame; int last_db_frame;
Storage::Schemes scheme; Storage::Schemes scheme;
@ -137,15 +139,15 @@ class Event {
public: public:
static const char *getSubPath( struct tm *time ) { static const char *getSubPath( struct tm *time ) {
static char subpath[PATH_MAX] = ""; static char subpath[PATH_MAX] = "";
snprintf( subpath, sizeof(subpath), "%02d/%02d/%02d/%02d/%02d/%02d", time->tm_year-100, time->tm_mon+1, time->tm_mday, time->tm_hour, time->tm_min, time->tm_sec ); snprintf(subpath, sizeof(subpath), "%02d/%02d/%02d/%02d/%02d/%02d", time->tm_year-100, time->tm_mon+1, time->tm_mday, time->tm_hour, time->tm_min, time->tm_sec);
return( subpath ); return subpath;
} }
static const char *getSubPath( time_t *time ) { static const char *getSubPath( time_t *time ) {
return Event::getSubPath( localtime( time ) ); return Event::getSubPath( localtime( time ) );
} }
char* getEventFile(void) { const char* getEventFile(void) {
return video_file; return video_file.c_str();
} }
public: public:
@ -155,12 +157,14 @@ class Event {
static void EmptyPreAlarmFrames() { static void EmptyPreAlarmFrames() {
while ( pre_alarm_count > 0 ) { while ( pre_alarm_count > 0 ) {
int i = pre_alarm_count - 1; int i = pre_alarm_count - 1;
Debug(1, "EmptyreAlarmFrame: %d", i);
delete pre_alarm_data[i].image; delete pre_alarm_data[i].image;
pre_alarm_data[i].image = NULL; pre_alarm_data[i].image = NULL;
if ( pre_alarm_data[i].alarm_frame ) { if ( pre_alarm_data[i].alarm_frame ) {
delete pre_alarm_data[i].alarm_frame; delete pre_alarm_data[i].alarm_frame;
pre_alarm_data[i].alarm_frame = NULL; pre_alarm_data[i].alarm_frame = NULL;
} }
pre_alarm_count--;
} }
pre_alarm_count = 0; pre_alarm_count = 0;
} }
@ -174,6 +178,7 @@ class Event {
pre_alarm_count++; pre_alarm_count++;
} }
void SavePreAlarmFrames() { void SavePreAlarmFrames() {
Debug(1, "SavePreAlarmFrame: %d", pre_alarm_count);
for ( int i = 0; i < pre_alarm_count; i++ ) { for ( int i = 0; i < pre_alarm_count; i++ ) {
AddFrame( AddFrame(
pre_alarm_data[i].image, pre_alarm_data[i].image,