[vlc-devel] commit: Fixed a crash in video filter_chain_t code when closing a filter. ( Laurent Aimar )

git version control git at videolan.org
Sun Mar 22 15:31:16 CET 2009


vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Sat Mar 21 16:02:48 2009 +0100| [b382aefa43ea208ff0bc2adab7014a1ceae63130] | committer: Laurent Aimar 

Fixed a crash in video filter_chain_t code when closing a filter.

It should fix #1929.
Thanks for Aurélien Nephtali investigation.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b382aefa43ea208ff0bc2adab7014a1ceae63130
---

 src/misc/filter_chain.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/misc/filter_chain.c b/src/misc/filter_chain.c
index 0805d40..7061c92 100644
--- a/src/misc/filter_chain.c
+++ b/src/misc/filter_chain.c
@@ -420,7 +420,10 @@ static int filter_chain_DeleteFilterInternal( filter_chain_t *p_chain,
              p_filter->psz_object_name, p_filter );
 
     /* Destroy the filter object */
-    AllocatorClean( &p_chain->allocator, p_filter );
+    if( IsInternalVideoAllocator( p_filter ) )
+        AllocatorClean( &internal_video_allocator, p_filter );
+    else
+        AllocatorClean( &p_chain->allocator, p_filter );
 
     vlc_object_detach( p_filter );
     if( p_filter->p_module )




More information about the vlc-devel mailing list