X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fcdda%2Faccess.c;h=f4de5bd75d2bc2f2a0bd190671f023982f196530;hb=482d8344a9aadc7c313e63b67432233a7339e35b;hp=ddf974a706e75270fa3ef0eb2997f33336aecc57;hpb=df61d33b06e2b3cbbe746b2f5a9bea5b370c24ff;p=vlc

diff --git a/modules/access/cdda/access.c b/modules/access/cdda/access.c
index ddf974a706..f4de5bd75d 100644
--- a/modules/access/cdda/access.c
+++ b/modules/access/cdda/access.c
@@ -30,7 +30,6 @@
 #include "cdda.h"          /* private structures. Also #includes vlc things */
 #include "info.h"          /* headers for meta info retrieval */
 #include "access.h"
-#include <vlc_playlist.h>  /* Has to come *after* cdda.h */
 #include "vlc_keys.h"
 #include <vlc_interface.h>
 
@@ -606,6 +605,7 @@ int CDDAOpen( vlc_object_t *p_this )
         psz_source = var_CreateGetString( p_this, "cd-audio" );
         if( !psz_source || !*psz_source )
         {
+            free( psz_source );
             /* Scan for a CD-ROM drive with a CD-DA in it. */
             char **ppsz_drives =
                     cdio_get_devices_with_cap( NULL,  CDIO_FS_AUDIO, false );
@@ -635,7 +635,6 @@ int CDDAOpen( vlc_object_t *p_this )
     p_cdda = calloc( 1, sizeof(cdda_data_t) );
     if( p_cdda == NULL )
     {
-        msg_Err( p_access, "out of memory" );
         free( psz_source );
         return VLC_ENOMEM;
     }
@@ -773,6 +772,7 @@ int CDDAOpen( vlc_object_t *p_this )
                 }
             }
         }
+        free( psz_paranoia );
     }
 #endif