Changeset 7d3cc85d1bc8a3d7aea4f5486148826304b0aa8b

Timestamp:

03/15/08 15:50:27 (6 months ago)

Author:

Richard Hosking <richard@hovis.net>

git-committer:

Richard Hosking <richard@hovis.net> 1205592627 +0000

git-parent:

[a19cac2195024dc9992fa582eeb4701602695003]

git-author:

Richard Hosking <richard@hovis.net> 1205592627 +0000

Message:

Fix very minor memory leak when using OSS for audio.

Files:

• modules/access/v4l2/v4l2.c (modified) (5 diffs)

modules/access/v4l2/v4l2.c

@@ -2452 +2452 @@
-                            vlc_bool_t b_demux )
-{
-    char *psz_device = p_sys->psz_adev;
-    int i_fd = 0;
-    int i_format;
-    /* OSS */
-if( !psz_device ) psz_device = strdup( OSS_DEFAULT ); /* FIXME leak */
-
-devic
+char* psz_oss_device_name = strdup( ( !p_sys->psz_adev ) ? OSS_DEFAULT : p_sys->psz_adev );
+
+oss_device_nam
-    {
-        msg_Err( p_this, "cannot open OSS audio device (%m)" );
@@ -2491 +2490 @@
-    if( !p_sys->psz_adev )
-        p_sys->psz_adev = strdup( OSS_DEFAULT );
+    free( psz_oss_device_name );
-    return i_fd;
-
- adev_fail:
-
+    free( psz_oss_device_name );
-    if( i_fd >= 0 ) close( i_fd );
-    return -1;
@@ -2894 +2895 @@
-    int i_fd = 0;
-    int i_caps;
-if( !psz_device ) psz_device = strdup( OSS_DEFAULT ); /* FIXME leak */
-
-devic
-
-devic
+char* psz_oss_device_name = strdup( ( !psz_device ) ? OSS_DEFAULT : psz_device );
+
+oss_device_nam
+
+oss_device_nam
-        goto open_failed;
-    }
@@ -2909 +2910 @@
-    }
-
+    free( psz_oss_device_name );
-    if( i_fd >= 0 ) close( i_fd );
-
@@ -2914 +2916 @@
-
-open_failed:
+    free( psz_oss_device_name );
-    if( i_fd >= 0 ) close( i_fd );
-    return VLC_FALSE;