cdda: memory leak due to STANDARD_BLOCK_ACCESS_INIT

diff --git a/modules/access/cdda.c b/modules/access/cdda.c
index c93995bb81c29b18bfe5300207d9f8ad112042f4..5d31a7d2a1dea2a708c4950d78558d7ca071b678 100644 (file)
--- a/modules/access/cdda.c
+++ b/modules/access/cdda.c
@@ -127,7 +127,6 @@ static cddb_disc_t *GetCDDBInfo( access_t *p_access, int i_titles, int *p_sector
 static int Open( vlc_object_t *p_this )
 {
     access_t     *p_access = (access_t*)p_this;
-    access_sys_t *p_sys;
     vcddev_t     *vcddev;
     char         *psz_name;
 
@@ -147,18 +146,26 @@ static int Open( vlc_object_t *p_this )
     if( psz_name[0] && psz_name[1] == ':' &&
         psz_name[2] == '\\' && psz_name[3] == '\0' ) psz_name[2] = '\0';
 #endif
-    /* Set up p_access */
-    STANDARD_BLOCK_ACCESS_INIT
 
-    /* Open CDDA */
-    if( (vcddev = ioctl_Open( VLC_OBJECT(p_access), psz_name ) ) == NULL )
+    access_sys_t *p_sys = calloc( 1, sizeof (*p_sys) );
+    if( unlikely(p_sys == NULL) )
     {
-        msg_Warn( p_access, "could not open %s", psz_name );
         free( psz_name );
+        return VLC_ENOMEM;
+    }
+    p_access->p_sys = p_sys;
+
+    /* Open CDDA */
+    vcddev = ioctl_Open( VLC_OBJECT(p_access), psz_name );
+    if( vcddev == NULL )
+        msg_Warn( p_access, "could not open %s", psz_name );
+    free( psz_name );
+    if( vcddev == NULL )
+    {
         free( p_sys );
         return VLC_EGENERIC;
     }
-    free( psz_name );
+
     p_sys->vcddev = vcddev;
 
     /* Do we play a single track ? */
@@ -224,6 +231,9 @@ static int Open( vlc_object_t *p_this )
                                      * (int64_t)CDDA_DATA_SIZE;
     }
 
+    /* Set up p_access */
+    access_InitFields( p_access );
+    ACCESS_SET_CALLBACKS( NULL, Block, Control, Seek );
     return VLC_SUCCESS;
 
 error: