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

Dont' call mysql_library_end as it segfaults and hangs.

This commit is contained in:
Isaac Connor 2020-05-14 12:00:36 -04:00
parent 88a910793c
commit efbab4e2bc
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/zm_db.cpp
View File

@ -81,10 +81,11 @@ bool zmDbConnect() {
void zmDbClose() {
if ( zmDbConnected ) {
db_mutex.lock();
mysql_close( &dbconn );
mysql_close(&dbconn);
// mysql_init() call implicitly mysql_library_init() but
// mysql_close() does not call mysql_library_end()
mysql_library_end();
// We get segfaults and a hang when we call this. So just don't.
//mysql_library_end();
zmDbConnected = false;
db_mutex.unlock();
}
@ -96,6 +97,12 @@ MYSQL_RES * zmDbFetch(const char * query) {
return NULL;
}
db_mutex.lock();
// Might have been disconnected while we waited for the lock
if ( !zmDbConnected ) {
db_mutex.unlock();
Error("Not connected.");
return NULL;
}
if ( mysql_query(&dbconn, query) ) {
db_mutex.unlock();