Changeset 5964 for pjproject

Timestamp:

Apr 8, 2019 1:24:10 AM (5 years ago)

Author:

riza

Message:

Misc (re #2147): Add lock to prevent race condition when accessing media list.
Thanks to Niclas Larsson for the report.

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua2/endpoint.hpp (modified) (1 diff)
• src/pjsua2/endpoint.cpp (modified) (5 diffs)

pjproject/trunk/pjsip/include/pjsua2/endpoint.hpp

@@ -1620 +1620 @@
     std::map<pj_thread_t*, pj_thread_desc*> threadDescMap;
     pj_mutex_t                  *threadDescMutex;
+    pj_mutex_t                  *mediaListMutex;
 
     /* Pending logging */

pjproject/trunk/pjsip/src/pjsua2/endpoint.cpp

@@ -480 +480 @@
  */
 Endpoint::Endpoint()
-: writer(NULL), threadDescMutex(NULL), mainThreadOnly(false), 
-  mainThread(NULL), pendingJobSize(0)
+: writer(NULL), threadDescMutex(NULL), mediaListMutex(NULL), 
+  mainThreadOnly(false), mainThread(NULL), pendingJobSize(0)
 {
     if (instance_) {
@@ -1713 +1713 @@
     PJSUA2_CHECK_EXPR( pj_mutex_create_simple(pjsua_var.pool, "threadDesc",
                                               &threadDescMutex) );
+
+    PJSUA2_CHECK_EXPR( pj_mutex_create_recursive(pjsua_var.pool, "mediaList",
+                                                 &mediaListMutex) );
 }
 
@@ -1780 +1783 @@
     }
 
+    if (mediaListMutex) {
+        pj_mutex_destroy(mediaListMutex);
+        mediaListMutex = NULL;
+    }
+
     status = pjsua_destroy2(flags);
 
@@ -2039 +2047 @@
 void Endpoint::mediaAdd(AudioMedia &media)
 {
-    if (mediaExists(media))
-        return;
+    pj_mutex_lock(mediaListMutex);
+
+    if (mediaExists(media)) {
+        pj_mutex_unlock(mediaListMutex);
+        return;
+    }
 
     mediaList.push_back(&media);
+    pj_mutex_unlock(mediaListMutex);
 }
 
 void Endpoint::mediaRemove(AudioMedia &media)
 {
+    pj_mutex_lock(mediaListMutex);
     AudioMediaVector::iterator it = std::find(mediaList.begin(),
                                               mediaList.end(),
@@ -2054 +2068 @@
         mediaList.erase(it);
 
+    pj_mutex_unlock(mediaListMutex);
 }
 
 bool Endpoint::mediaExists(const AudioMedia &media) const
 {
+    bool exists;
+
+    pj_mutex_lock(mediaListMutex);
     AudioMediaVector::const_iterator it = std::find(mediaList.begin(),
                                                     mediaList.end(),
                                                     &media);
-
-    return (it != mediaList.end());
+    exists = (it != mediaList.end());
+    pj_mutex_unlock(mediaListMutex);
+    return exists;
 }