Changeset 6074 for pjproject/trunk/pjsip/src/pjsua2/endpoint.cpp

Timestamp:

Sep 23, 2019 10:47:05 PM (5 years ago)

Author:

riza

Message:

Close #2232: Crash on Endpoint::libDestroy() when there is an active call.

File:

• pjproject/trunk/pjsip/src/pjsua2/endpoint.cpp (modified) (13 diffs)

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

@@ -479 +479 @@
  * Endpoint instance
  */
-Endpoint::Endpoint()
-: writer(NULL), threadDescMutex(NULL), mediaListMutex(NULL), 
-  mainThreadOnly(false), mainThread(NULL), pendingJobSize(0)
+Endpoint::Endpoint():
+#if !DEPRECATED_FOR_TICKET_2232
+mediaListMutex(NULL),
+#endif
+writer(NULL), threadDescMutex(NULL), mainThreadOnly(false),
+mainThread(NULL), pendingJobSize(0)
 {
     if (instance_) {
@@ -505 +508 @@
     }
 
+#if !DEPRECATED_FOR_TICKET_2232
     clearCodecInfoList(codecInfoList);
     clearCodecInfoList(videoCodecInfoList);
+#endif
 
     try {
@@ -1714 +1719 @@
                                               &threadDescMutex) );
 
+#if !DEPRECATED_FOR_TICKET_2232
     PJSUA2_CHECK_EXPR( pj_mutex_create_recursive(pjsua_var.pool, "mediaList",
                                                  &mediaListMutex) );
+#endif
 }
 
@@ -1783 +1790 @@
     }
 
+#if !DEPRECATED_FOR_TICKET_2232
     while(mediaList.size() > 0) {
         AudioMedia *cur_media = mediaList[0];
@@ -1792 +1800 @@
         mediaListMutex = NULL;
     }
+#endif
 
     status = pjsua_destroy2(flags);
@@ -2047 +2056 @@
 }
 
+#if !DEPRECATED_FOR_TICKET_2232
 const AudioMediaVector &Endpoint::mediaEnumPorts() const PJSUA2_THROW(Error)
 {
     return mediaList;
 }
+#endif
 
 AudioMediaVector2 Endpoint::mediaEnumPorts2() const PJSUA2_THROW(Error)
@@ -2090 +2101 @@
 void Endpoint::mediaAdd(AudioMedia &media)
 {
+#if !DEPRECATED_FOR_TICKET_2232
     /* mediaList serves mediaEnumPorts() only, once mediaEnumPorts()
      * is removed, this function implementation should be no-op.
@@ -2102 +2114 @@
         mediaList.push_back(&media);
     pj_mutex_unlock(mediaListMutex);
+#else
+    PJ_UNUSED_ARG(media);
+#endif
 }
 
 void Endpoint::mediaRemove(AudioMedia &media)
 {
+#if !DEPRECATED_FOR_TICKET_2232
     /* mediaList serves mediaEnumPorts() only, once mediaEnumPorts()
      * is removed, this function implementation should be no-op.
@@ -2117 +2133 @@
         mediaList.erase(it);
     pj_mutex_unlock(mediaListMutex);
+#else
+    PJ_UNUSED_ARG(media);
+#endif
 }
 
@@ -2142 +2161 @@
  * Codec operations.
  */
+
+#if !DEPRECATED_FOR_TICKET_2232
 const CodecInfoVector &Endpoint::codecEnum() PJSUA2_THROW(Error)
 {
@@ -2152 +2173 @@
     return codecInfoList;
 }
+#endif
 
 CodecInfoVector2 Endpoint::codecEnum2() const PJSUA2_THROW(Error)
@@ -2220 +2242 @@
 }
 
+#if !DEPRECATED_FOR_TICKET_2232
 const CodecInfoVector &Endpoint::videoCodecEnum() PJSUA2_THROW(Error)
 {
@@ -2232 +2255 @@
     return videoCodecInfoList;
 }
+#endif
 
 CodecInfoVector2 Endpoint::videoCodecEnum2() const PJSUA2_THROW(Error)