Changeset 5cf39390c0d9a4c9ef2860746126f0bbad3370b6

Timestamp:

03/07/08 22:55:07 (3 months ago)

Author:

Rémi Duraffort <ivoire@videolan.org>

git-committer:

Rémi Duraffort <ivoire@videolan.org> 1215118507 +0200

git-parent:

[ac217da0399df26771fec3005f4faaa65a2eb34b]

git-author:

Rémi Duraffort <ivoire@videolan.org> 1215033486 +0200

Message:

Fix memleaks (corner case).

Files:

• modules/misc/rtsp.c (modified) (3 diffs)
• modules/stream_out/rtsp.c (modified) (1 diff)

modules/misc/rtsp.c

@@ -493 +493 @@
-    if( asprintf( &psz_urlc, "%s/trackID=%d",
-              p_media->psz_rtsp_path, p_media->i_es ) < 0 )
+    {
+        free( p_es );
-        return VLC_ENOMEM;
+    }
-    msg_Dbg( p_vod, "  - ES %4.4s (%s)", (char *)&p_fmt->i_codec, psz_urlc );
-
@@ -584 +587 @@
-                /* */
-                if( p_64_sps && p_64_pps )
+                {
-                    if( asprintf( &p_es->psz_fmtp,
-                                  "packetization-mode=1;profile-level-id=%s;"
-                                  "sprop-parameter-sets=%s,%s;", hexa, p_64_sps,
-                                  p_64_pps ) < 0 )
+                    {
+                        free( p_64_sps );
+                        free( p_64_pps );
+                        free( psz_urlc );
+                        free( p_es );
-                        return VLC_ENOMEM;
+                    }
+                }
-                free( p_64_sps );
-                free( p_64_pps );
@@ -650 +661 @@
-            msg_Err( p_vod, "cannot add this stream (unsupported "
-                    "codec: %4.4s)", (char*)&p_fmt->i_codec );
+            free( psz_urlc );
-            free( p_es );
-            return VLC_EGENERIC;

modules/stream_out/rtsp.c

@@ -139 +139 @@
-    free( rtsp->psz_path );
-    vlc_mutex_destroy( &rtsp->lock );
+
+    free( rtsp );
-}
-