ben.carrasco/freeswitch-modules
1
0
Fork 0
mirror of https://github.com/jambonz/freeswitch-modules.git synced 2025-12-19 06:57:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

bug: fix crashing race condition in mod_dub

Browse Source
This commit is contained in:
Dave Horton
2024-03-25 18:14:44 -04:00
parent be6758c3a8
commit 48aeedec0a
2 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
mod_dub/ap_file.cpp
View File

@@ -58,7 +58,7 @@ AudioProducerFile::AudioProducerFile(
std::mutex& mutex,
CircularBuffer_t& circularBuffer,
int sampleRate
) : AudioProducer(mutex, circularBuffer, sampleRate), _timer(io_service), _mh(nullptr) {
) : AudioProducer(mutex, circularBuffer, sampleRate), _timer(io_service), _mh(nullptr), _fp(nullptr) {
AudioProducerFile::_init();
}
@@ -176,16 +176,19 @@ void AudioProducerFile::stop() {
}
void AudioProducerFile::reset() {
{
std::lock_guard<std::mutex> lock(_mutex);
if (_fp) {
fclose(_fp);
_fp = nullptr;
fclose(_fp);
_fp = nullptr;
}
if (_mh) {
mpg123_close(_mh);
mpg123_delete(_mh);
_mh = nullptr;
}
}
if (_mh) {
mpg123_close(_mh);
mpg123_delete(_mh);
_mh = nullptr;
}
_timer.cancel();
_timer.cancel();
_status = Status_t::STATUS_NONE;
}

21
mod_dub/ap_http.cpp
View File

@@ -636,15 +636,18 @@ void AudioProducerHttp::stop() {
}
void AudioProducerHttp::reset() {
if (_easy) {
curl_multi_remove_handle(global.multi, _easy);
curl_easy_cleanup(_easy);
_easy = nullptr;
}
if (_mh) {
mpg123_close(_mh);
mpg123_delete(_mh);
_mh = nullptr;
{
std::lock_guard<std::mutex> lock(_mutex);
if (_easy) {
curl_multi_remove_handle(global.multi, _easy);
curl_easy_cleanup(_easy);
_easy = nullptr;
}
if (_mh) {
mpg123_close(_mh);
mpg123_delete(_mh);
_mh = nullptr;
}
}
_err_msg.clear();
_response_code = 0;