Changeset 6098 for pjproject

Timestamp:

Oct 30, 2019 5:20:06 AM (5 years ago)

Author:

ming

Message:

Fixed #2248: Memory leak if stream fails to be created

Location:

pjproject/trunk/pjmedia/src/pjmedia

Files:

• stream.c (modified) (1 diff)
• vid_stream.c (modified) (9 diffs)

pjproject/trunk/pjmedia/src/pjmedia/stream.c

@@ -2850 +2850 @@
 
     /* Send RTCP BYE (also SDES & XR) */
-    if (!stream->rtcp_sdes_bye_disabled) {
+    if (stream->transport && !stream->rtcp_sdes_bye_disabled) {
         send_rtcp(stream, PJ_TRUE, PJ_TRUE, PJ_TRUE, PJ_FALSE);
     }

pjproject/trunk/pjmedia/src/pjmedia/vid_stream.c

@@ -1604 +1604 @@
                                                &stream->codec);
     if (status != PJ_SUCCESS)
-        return status;
+        goto err_cleanup;
 
     /* Get codec param: */
@@ -1614 +1614 @@
                                                          &def_param);
         if (status != PJ_SUCCESS)
-            return status;
+            goto err_cleanup;
 
         info->codec_param = pjmedia_vid_codec_param_clone(pool, &def_param);
@@ -1665 +1665 @@
     status = pj_mutex_create_simple(pool, NULL, &stream->jb_mutex);
     if (status != PJ_SUCCESS)
-        return status;
+        goto err_cleanup;
 
     /* Init and open the codec. */
     status = pjmedia_vid_codec_init(stream->codec, pool);
     if (status != PJ_SUCCESS)
-        return status;
+        goto err_cleanup;
     status = pjmedia_vid_codec_open(stream->codec, info->codec_param);
     if (status != PJ_SUCCESS)
-        return status;
+        goto err_cleanup;
 
     /* Subscribe to codec events */
@@ -1732 +1732 @@
                              info->rx_pt, info, &stream->dec);
     if (status != PJ_SUCCESS)
-        return status;
+        goto err_cleanup;
 
     /* Create encoder channel */
@@ -1738 +1738 @@
                              info->tx_pt, info, &stream->enc);
     if (status != PJ_SUCCESS)
-        return status;
+        goto err_cleanup;
 
     /* Create temporary buffer for immediate decoding */
@@ -1797 +1797 @@
                                  jb_max, &stream->jb);
     if (status != PJ_SUCCESS)
-        return status;
+        goto err_cleanup;
 
 
@@ -1847 +1847 @@
     status = pjmedia_transport_attach2(tp, &att_param);
     if (status != PJ_SUCCESS)
-        return status;
+        goto err_cleanup;
 
     stream->transport = tp;
@@ -1904 +1904 @@
 
     return PJ_SUCCESS;
+
+err_cleanup:
+    pjmedia_vid_stream_destroy(stream);
+    return status;
 }
 
@@ -1928 +1932 @@
 
     /* Send RTCP BYE (also SDES) */
-    if (!stream->rtcp_sdes_bye_disabled) {
+    if (stream->transport && !stream->rtcp_sdes_bye_disabled) {
         send_rtcp(stream, PJ_TRUE, PJ_TRUE);
     }