misc possible buffer/resource misuse & tidy compilation

diff --git a/modules/codec/ffmpeg/encoder.c b/modules/codec/ffmpeg/encoder.c
index a341cf936f50e07cf0216640e24b6e8124707279..8a1b542b43aa29e69cd395edc4a592d2be5d3817 100644 (file)
--- a/modules/codec/ffmpeg/encoder.c
+++ b/modules/codec/ffmpeg/encoder.c
@@ -33,7 +33,7 @@
 #include <vlc/decoder.h>
 
 /* ffmpeg header */
-#define HAVE_MMX
+#define HAVE_MMX 1
 #ifdef HAVE_FFMPEG_AVCODEC_H
 #   include <ffmpeg/avcodec.h>
 #else

diff --git a/modules/codec/ffmpeg/ffmpeg.c b/modules/codec/ffmpeg/ffmpeg.c
index 86808ad32e1253f482cefeba06dd39efdfe7b3f7..a978a27d5ce594f9e01e62845cc06f6a043e6647 100644 (file)
--- a/modules/codec/ffmpeg/ffmpeg.c
+++ b/modules/codec/ffmpeg/ffmpeg.c
@@ -29,7 +29,7 @@
 #include <vlc/decoder.h>
 
 /* ffmpeg header */
-#define HAVE_MMX
+#define HAVE_MMX 1
 #ifdef HAVE_FFMPEG_AVCODEC_H
 #   include <ffmpeg/avcodec.h>
 #else
@@ -360,8 +360,8 @@ static void LibavcodecCallback( void *p_opaque, int i_level,
     psz_item_name = p_avc->item_name(p_opaque);
     psz_new_format = malloc( strlen(psz_format) + strlen(psz_item_name)
                               + 18 + 5 );
-    sprintf( psz_new_format, "%s (%s@%p)", psz_format,
-             p_avc->item_name(p_opaque), p_opaque );
+    snprintf( psz_new_format, strlen(psz_format) + strlen(psz_item_name)
+              + 18 + 5, "%s (%s@%p)", psz_format, p_avc->item_name(p_opaque), p_opaque );
     msg_GenericVa( p_this, i_vlc_level, MODULE_STRING, psz_new_format, va );
     free( psz_new_format );
 }

diff --git a/src/misc/threads.c b/src/misc/threads.c
index 9b2eb3d73eeb616ef5a83277827d1319ecdd1516..ca0fdac13b5fc28536a8110a5c97ff7468f46ca9 100644 (file)
--- a/src/misc/threads.c
+++ b/src/misc/threads.c
@@ -483,6 +483,9 @@ int __vlc_cond_destroy( char * psz_file, int i_line, vlc_cond_t *p_condvar )
         i_result = !CloseHandle( p_condvar->event )
           || !CloseHandle( p_condvar->semaphore );
 
+    if( p_condvar->semaphore != NULL )
+               DeleteCriticalSection( &p_condvar->csection );
+
 #elif defined( HAVE_KERNEL_SCHEDULER_H )
     p_condvar->init = 0;
     return 0;

diff --git a/src/playlist/view.c b/src/playlist/view.c
index 3ae05fdc732d0d2d0e6aeee84b34a18639659bba..b963d083e1b0f4d48a2448e5fc7981a81ae26d81 100644 (file)
--- a/src/playlist/view.c
+++ b/src/playlist/view.c
@@ -301,6 +301,7 @@ playlist_item_t * playlist_NodeCreate( playlist_t *p_playlist, int i_view,
 
     p_item->pp_parents = NULL;
     p_item->i_parents = 0;
+    p_item->i_serial = 0;
 
     p_item->i_flags |= PLAYLIST_SKIP_FLAG; /* Default behaviour */