Changeset 43f58febd846de699ea5dfee21f4b1f03b2adc0d

Timestamp:

05/09/08 23:11:52 (2 months ago)

Author:

Rafaël Carré <funman@videolan.org>

git-committer:

Rafaël Carré <funman@videolan.org> 1210367512 +0200

git-parent:

[2c73e8cff83c285e8ebe30be04ca1dbe6166aa37]

git-author:

Rafaël Carré <funman@videolan.org> 1210367512 +0200

Message:

Do not leak psz_demux

Files:

• modules/access/directory.c (modified) (1 diff)
• modules/access/dshow/dshow.cpp (modified) (1 diff)
• modules/access/dv.c (modified) (1 diff)
• modules/access/http.c (modified) (5 diffs)
• modules/access/udp.c (modified) (3 diffs)
• modules/access/vcd/vcd.c (modified) (1 diff)
• modules/access/vcdx/access.c (modified) (1 diff)

modules/access/directory.c

@@ -167 +167 @@
-
-    /* Force a demux */
+    free( p_access->psz_demux );
-    p_access->psz_demux = strdup( "directory" );
-

modules/access/dshow/dshow.cpp

@@ -658 +658 @@
-            p_stream->i_fourcc == VLC_FOURCC('d','v','h','d') )
-        {
+            free( p_access->psz_demux );
-            p_access->psz_demux = strdup( "rawdv" );
-        }
-        else if( p_stream->i_fourcc == VLC_FOURCC('m','p','2','v') )
-        {
-
+
+
-        }
-    }

modules/access/dv.c

@@ -341 +341 @@
-    block_t *p_block = NULL;
-
-
-
+
+
+
+
+
+
+
-
-    vlc_mutex_lock( &p_sys->lock );

modules/access/http.c

@@ -455 +455 @@
-            if( !strcasecmp( p_sys->psz_mime, "video/nsv" ) ||
-                !strcasecmp( p_sys->psz_mime, "video/nsa" ) )
+            {
+                free( p_access->psz_demux );
-                p_access->psz_demux = strdup( "nsv" );
+            }
-            else if( !strcasecmp( p_sys->psz_mime, "audio/aac" ) ||
-                     !strcasecmp( p_sys->psz_mime, "audio/aacp" ) )
+            {
+                free( p_access->psz_demux );
-                p_access->psz_demux = strdup( "m4a" );
+            }
-            else if( !strcasecmp( p_sys->psz_mime, "audio/mpeg" ) )
+            {
+                free( p_access->psz_demux );
-                p_access->psz_demux = strdup( "mp3" );
+            }
-
-            msg_Info( p_access, "Raw-audio server found, %s demuxer selected",
@@ -473 +482 @@
-        else if( !p_sys->psz_mime )
-        {
-
-
+
+
+
-        }
-        /* else probably Ogg Vorbis */
@@ -482 +492 @@
-             !strcasecmp( p_sys->psz_mime, "misc/ultravox" ) )
-    {
+        free( p_access->psz_demux );
-        /* Grrrr! detect ultravox server and force NSV demuxer */
-        p_access->psz_demux = strdup( "nsv" );
@@ -487 +498 @@
-    else if( !strcmp( p_access->psz_access, "itpc" ) )
-    {
+        free( p_access->psz_demux );
-        p_access->psz_demux = strdup( "podcast" );
-    }
@@ -492 +504 @@
-             !strncasecmp( p_sys->psz_mime, "application/xspf+xml", 20 ) &&
-             ( memchr( " ;\t", p_sys->psz_mime[20], 4 ) != NULL ) )
+    {
+        free( p_access->psz_demux );
-        p_access->psz_demux = strdup( "xspf-open" );
+    }
-
-    if( p_sys->b_reconnect ) msg_Dbg( p_access, "auto re-connect enabled" );

modules/access/udp.c

@@ -744 +744 @@
-        case 33:
-            msg_Dbg( p_access, "detected MPEG2 TS over RTP" );
+            free( p_access->psz_demux );
-            p_access->psz_demux = strdup( "ts" );
-            break;
@@ -749 +750 @@
-        case 14:
-            msg_Dbg( p_access, "detected MPEG Audio over RTP" );
+            free( p_access->psz_demux );
-            p_access->psz_demux = strdup( "mpga" );
-            break;
@@ -754 +756 @@
-        case 32:
-            msg_Dbg( p_access, "detected MPEG Video over RTP" );
+            free( p_access->psz_demux );
-            p_access->psz_demux = strdup( "mpgv" );
-            break;

modules/access/vcd/vcd.c

@@ -212 +212 @@
-        VCD_DATA_SIZE;
-
+    free( p_access->psz_demux );
-    p_access->psz_demux = strdup( "ps" );
-

modules/access/vcdx/access.c

@@ -958 +958 @@
-    vcdplayer_play( p_access, itemid );
-
+    free( p_access->psz_demux );
-    p_access->psz_demux = strdup( "ps" );
-