Fix concurrency issues in ErizoAPI/MediaStream (#1442)

lynckia · Jul 25, 2019 · a62f59a · a62f59a
1 parent 603a863
commit a62f59a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/erizoAPI/MediaStream.cc b/erizoAPI/MediaStream.cc
@@ -65,6 +65,7 @@ MediaStream::~MediaStream() {
 }
 
 void MediaStream::closeEvents() {
+  boost::mutex::scoped_lock lock(mutex);
   has_stats_callback_ = false;
   has_event_callback_ = false;
   if (!uv_is_closing(reinterpret_cast<uv_handle_t*>(async_stats_))) {
@@ -434,27 +435,27 @@ NAN_METHOD(MediaStream::onMediaStreamEvent) {
 }
 
 void MediaStream::notifyStats(const std::string& message) {
-  if (!this->has_stats_callback_) {
+  boost::mutex::scoped_lock lock(mutex);
+  if (!has_stats_callback_) {
     return;
   }
   if (!async_stats_) {
     return;
   }
-  boost::mutex::scoped_lock lock(mutex);
-  this->stats_messages.push(message);
+  stats_messages.push(message);
   async_stats_->data = this;
   uv_async_send(async_stats_);
 }
 
 void MediaStream::notifyMediaStreamEvent(const std::string& type, const std::string& message) {
-  if (!this->has_event_callback_) {
+  boost::mutex::scoped_lock lock(mutex);
+  if (!has_event_callback_) {
     return;
   }
   if (!async_event_) {
     return;
   }
-  boost::mutex::scoped_lock lock(mutex);
-  this->event_messages.push(std::make_pair(type, message));
+  event_messages.push(std::make_pair(type, message));
   async_event_->data = this;
   uv_async_send(async_event_);
 }

diff --git a/erizoAPI/WebRtcConnection.cc b/erizoAPI/WebRtcConnection.cc
@@ -56,6 +56,8 @@ void WebRtcConnection::close() {
     me.reset();
   }
 
+  boost::mutex::scoped_lock lock(mutex);
+
   if (!uv_is_closing(reinterpret_cast<uv_handle_t*>(async_))) {
     ELOG_DEBUG("%s, message: Closing handle", toLog());
     uv_close(reinterpret_cast<uv_handle_t*>(async_), destroyWebRtcConnectionAsyncHandle);
@@ -465,8 +467,8 @@ void WebRtcConnection::notifyEvent(erizo::WebRTCEvent event, const std::string&
   if (!async_) {
     return;
   }
-  this->event_status.push(event);
-  this->event_messages.push(message);
+  event_status.push(event);
+  event_messages.push(message);
   async_->data = this;
   uv_async_send(async_);
 }