[PATCH] marquee crash fix by Dermot McGahon.

diff --git a/THANKS b/THANKS
index 02ec12a42c12182e123d75cc8847a511d0005701..2af9fb8fe68419891c8ef9a4a12f1030f1d76afe 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -52,6 +52,7 @@ David Weber <david_weber at gmx.de> - Mac OS X interface design & graphics (v0.5
 Davor Orel <syntheticamac at yahoo.it> - Mac OS X icons
 Dennis van Amerongen <Dennis dot vanAmerongen at nob dot nl> - x264 options unification
 Dennis Lou <dlou99 at yahoo dot com> - ATSC support in the DVB module
+Dermot McGahon <dermot at dspsrv dot com> - Bug fixes
 Diego Petteno <flameeyes at gentoo dot org> - remove usage of internal ffmpeg symbols
 DirektX <direktx at freemail.hu> - Hungarian translation
 Dugal Harris - DirectShow fixes and MJPEG patches

diff --git a/modules/video_filter/marq.c b/modules/video_filter/marq.c
index aa671735e099d17aa8990ad0699fd4ae4831f878..b4e1dd4993d8d2bd391a20605a2e3db79d55f33a 100644 (file)
--- a/modules/video_filter/marq.c
+++ b/modules/video_filter/marq.c
@@ -227,7 +227,6 @@ static void DestroyFilter( vlc_object_t *p_this )
 
     if( p_sys->p_style ) free( p_sys->p_style );
     if( p_sys->psz_marquee ) free( p_sys->psz_marquee );
-    free( p_sys );
 
     /* Delete the marquee variables */
 #define DEL_VAR(var) \
@@ -241,6 +240,8 @@ static void DestroyFilter( vlc_object_t *p_this )
     DEL_VAR( "marq-color" );
     DEL_VAR( "marq-opacity" );
     DEL_VAR( "marq-size" );
+
+    free( p_sys );
 }
 /****************************************************************************
  * String formating functions