ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

use delete[] instead of delete.

pull/3044/head
Isaac Connor 2020-04-30 11:04:55 -04:00
parent c99db3a03f
commit 9beb5cee3a
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/zm_ffmpeg_input.cpp
View File

@ -15,7 +15,11 @@ FFmpeg_Input::FFmpeg_Input() {
FFmpeg_Input::~FFmpeg_Input() {
if ( streams ) {
delete streams;
for ( unsigned int i = 0; i < input_format_context->nb_streams; i += 1 ) {
avcodec_close(streams[i].context);
streams[i].context = NULL;
}
delete[] streams;
streams = NULL;
}
}

10
src/zm_user.cpp
View File

@ -107,14 +107,18 @@ User *zmLoadUser(const char *username, const char *password) {
mysql_real_escape_string(&dbconn, safer_username, username, username_length);
snprintf(sql, sizeof(sql),
"SELECT `Id`, `Username`, `Password`, `Enabled`, `Stream`+0, `Events`+0, `Control`+0, `Monitors`+0, `System`+0, `MonitorIds`"
" FROM `Users` WHERE `Username` = '%s' AND `Enabled` = 1", safer_username);
"SELECT `Id`, `Username`, `Password`, `Enabled`,"
" `Stream`+0, `Events`+0, `Control`+0, `Monitors`+0, `System`+0,"
" `MonitorIds`"
" FROM `Users` WHERE `Username` = '%s' AND `Enabled` = 1",
safer_username);
delete[] safer_username;
safer_username = NULL;
if ( mysql_query(&dbconn, sql) ) {
Error("Can't run query: %s", mysql_error(&dbconn));
exit(mysql_errno(&dbconn));
}
delete safer_username;
MYSQL_RES *result = mysql_store_result(&dbconn);
if ( !result ) {