Changeset 6076

Timestamp:

Sep 24, 2019 2:46:12 PM (5 years ago)

Author:

riza

Message:

Fix #2234: Memory leak with third party resampling.

Location:

pjproject/trunk/pjmedia

Files:

• include/pjmedia/conference.h (modified) (3 diffs)
• src/pjmedia/conference.c (modified) (9 diffs)

pjproject/trunk/pjmedia/include/pjmedia/conference.h

@@ -43 +43 @@
 
 PJ_BEGIN_DECL
+
+/* Since 1.3 pjmedia_conf_add_passive_port() has been deprecated
+ * and replaced by splitcomb.
+ * See also https://trac.pjsip.org/repos/ticket/2234.
+ */
+#ifndef DEPRECATED_FOR_TICKET_2234
+#  define DEPRECATED_FOR_TICKET_2234    1
+#endif
 
 /**
@@ -238 +246 @@
 
 
+#if !DEPRECATED_FOR_TICKET_2234
 /**
  * <i><b>Warning:</b> This API has been deprecated since 1.3 and will be
@@ -280 +289 @@
                                                     pjmedia_port **p_port );
 
+#endif
 
 /**

pjproject/trunk/pjmedia/src/pjmedia/conference.c

@@ -252 +252 @@
 static pj_status_t get_frame(pjmedia_port *this_port, 
                              pjmedia_frame *frame);
+static pj_status_t destroy_port(pjmedia_port *this_port);
+
+#if !DEPRECATED_FOR_TICKET_2234
 static pj_status_t get_frame_pasv(pjmedia_port *this_port, 
                                   pjmedia_frame *frame);
-static pj_status_t destroy_port(pjmedia_port *this_port);
 static pj_status_t destroy_port_pasv(pjmedia_port *this_port);
+#endif
 
 
@@ -668 +671 @@
         
         ++ci;
+
+        if (cport->rx_resample) {
+            pjmedia_resample_destroy(cport->rx_resample);
+            cport->rx_resample = NULL;
+        }
+        if (cport->tx_resample) {
+            pjmedia_resample_destroy(cport->tx_resample);
+            cport->tx_resample = NULL;
+        }
         if (cport->delay_buf) {
             pjmedia_delay_buf_destroy(cport->delay_buf);
@@ -691 +703 @@
 }
 
+#if !DEPRECATED_FOR_TICKET_2234
 static pj_status_t destroy_port_pasv(pjmedia_port *this_port) {
     pjmedia_conf *conf = (pjmedia_conf*) this_port->port_data.pdata;
@@ -702 +715 @@
     return status;
 }
+#endif
 
 /*
@@ -815 +829 @@
 
 
+#if !DEPRECATED_FOR_TICKET_2234
 /*
  * Add passive port.
@@ -916 +931 @@
     return PJ_SUCCESS;
 }
+#endif
 
 
@@ -1174 +1190 @@
     }
 
+    /* Destroy resample if this conf port has it. */
+    if (conf_port->rx_resample) {
+        pjmedia_resample_destroy(conf_port->rx_resample);
+        conf_port->rx_resample = NULL;
+    }
+    if (conf_port->tx_resample) {
+        pjmedia_resample_destroy(conf_port->tx_resample);
+        conf_port->tx_resample = NULL;
+    }
+
     /* Destroy pjmedia port if this conf port is passive port,
      * i.e: has delay buf.
      */
     if (conf_port->delay_buf) {
+        pjmedia_delay_buf_destroy(conf_port->delay_buf);
+        conf_port->delay_buf = NULL;
+
         pjmedia_port_destroy(conf_port->port);
         conf_port->port = NULL;
@@ -2174 +2203 @@
 
 
+#if !DEPRECATED_FOR_TICKET_2234
 /*
  * get_frame() for passive port
@@ -2185 +2215 @@
     return -1;
 }
+#endif