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

Fix event logging to database

This commit is contained in:
Emmanuel Papin 2014-11-17 17:32:55 +01:00
parent a03b3ce4e0
commit ef452cb986
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/zm_event.cpp
View File

@ -63,7 +63,7 @@ Event::Event( Monitor *p_monitor, struct timeval p_start_time, const std::string
std::string notes; std::string notes;
createNotes( notes ); createNotes( notes );
static char escapedNotes[ZM_NOTES_MAX_SIZE + 1]; static char escapedNotes[ZM_NOTES_MAX_SIZE*2 + 1];
mysql_real_escape_string( &dbconn, escapedNotes, notes.c_str(), notes.length() ); mysql_real_escape_string( &dbconn, escapedNotes, notes.c_str(), notes.length() );
bool untimedEvent = false; bool untimedEvent = false;
@ -212,10 +212,10 @@ void Event::createNotes( std::string &notes )
notes += *setIter; notes += *setIter;
} }
} }
if (notes.size() > ZM_NOTES_MAX_SIZE) if (notes.length() > ZM_NOTES_MAX_SIZE)
{ {
std::string sTrunc = "... (content truncated)"; std::string sTrunc = "... (content truncated)";
notes = notes.substr(0, (ZM_NOTES_MAX_SIZE - sTrunc.size())); notes = notes.substr(0, (ZM_NOTES_MAX_SIZE - sTrunc.length()));
notes += sTrunc; notes += sTrunc;
} }
} }
@ -495,7 +495,7 @@ void Event::updateNotes( const StringSetMap &newNoteSetMap )
Fatal( "Unable to execute sql '%s': %s", sql, mysql_stmt_error(stmt) ); Fatal( "Unable to execute sql '%s': %s", sql, mysql_stmt_error(stmt) );
} }
#else #else
static char escapedNotes[ZM_NOTES_MAX_SIZE]; static char escapedNotes[ZM_NOTES_MAX_SIZE*2 + 1];
mysql_real_escape_string( &dbconn, escapedNotes, notes.c_str(), notes.length() ); mysql_real_escape_string( &dbconn, escapedNotes, notes.c_str(), notes.length() );