* Fixed a remaining buffer overflow in the Gnome interface and applied

    the patches to the Gtk+ interface.

diff --git a/ChangeLog b/ChangeLog
index d516d4700fdf1472b2b33396889c15606642ae3e..9f238d63f4e845663fd6a2c3f5b03e56874e4d47 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
 
 HEAD
 
+  * Fixed a remaining buffer overflow in the Gnome interface and applied
+    the patches to the Gtk+ interface.
   * Fixed a segfault in the SPU decoder initialization.
   * Mandatory step for video output IV and the audio output quality
     fix: the output threads are now spawned when a decoder needs one,

diff --git a/plugins/gnome/intf_gnome.c b/plugins/gnome/intf_gnome.c
index 14a6afbd8324bb12c15dbb4bab3aa24b09618f07..f19859ba2f39fe0f7819d472e1a2745233e88a46 100644 (file)
--- a/plugins/gnome/intf_gnome.c
+++ b/plugins/gnome/intf_gnome.c
@@ -2,7 +2,7 @@
  * intf_gnome.c: Gnome interface
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: intf_gnome.c,v 1.34 2001/05/01 04:18:18 sam Exp $
+ * $Id: intf_gnome.c,v 1.35 2001/05/01 15:12:22 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Stéphane Borel <stef@via.ecp.fr>
@@ -438,14 +438,13 @@ static gint GnomeLanguageMenus( gpointer          p_data,
                                 gint              i_cat,
                           void(*pf_toggle )( GtkCheckMenuItem *, gpointer ) )
 {
-#define GNOME_LANGUAGE_MENU_SIZE 64
     intf_thread_t *     p_intf;
     GtkWidget *         p_menu;
     GtkWidget *         p_separator;
     GtkWidget *         p_item;
     GtkWidget *         p_item_active;
     GSList *            p_group;
-    char                psz_name[ GNOME_LANGUAGE_MENU_SIZE ];
+    char                psz_name[ GNOME_MENU_LABEL_SIZE ];
     gint                i_item;
     gint                i;
 
@@ -464,8 +463,8 @@ static gint GnomeLanguageMenus( gpointer          p_data,
     p_menu = gtk_menu_new();
 
     /* special case for "off" item */
-    snprintf( psz_name, GNOME_LANGUAGE_MENU_SIZE, "Off" );
-    psz_name[ GNOME_LANGUAGE_MENU_SIZE - 1 ] = '\0';
+    snprintf( psz_name, GNOME_MENU_LABEL_SIZE, "Off" );
+    psz_name[ GNOME_MENU_LABEL_SIZE - 1 ] = '\0';
 
     p_item = gtk_radio_menu_item_new_with_label( p_group, psz_name );
     p_group = gtk_radio_menu_item_group( GTK_RADIO_MENU_ITEM( p_item ) );
@@ -496,9 +495,9 @@ static gint GnomeLanguageMenus( gpointer          p_data,
             strcpy( psz_name, p_intf->p_input->stream.pp_es[i]->psz_desc );
             if( psz_name[0] == '\0' )
             {
-                snprintf( psz_name, GNOME_LANGUAGE_MENU_SIZE,
+                snprintf( psz_name, GNOME_MENU_LABEL_SIZE,
                           "Language %d", i_item );
-                psz_name[ GNOME_LANGUAGE_MENU_SIZE - 1 ] = '\0';
+                psz_name[ GNOME_MENU_LABEL_SIZE - 1 ] = '\0';
             }
 
             p_item = gtk_radio_menu_item_new_with_label( p_group, psz_name );
@@ -550,9 +549,8 @@ static gint GnomeLanguageMenus( gpointer          p_data,
 static gint GnomeAngleMenu( gpointer p_data, GtkWidget * p_angle,
                         void(*pf_toggle)( GtkCheckMenuItem *, gpointer ) )
 {
-#define GNOME_ANGLE_MENU_SIZE 64
     intf_thread_t *     p_intf;
-    char                psz_name[ GNOME_ANGLE_MENU_SIZE ];
+    char                psz_name[ GNOME_MENU_LABEL_SIZE ];
     GtkWidget *         p_angle_menu;
     GSList *            p_angle_group;
     GtkWidget *         p_item;
@@ -575,8 +573,8 @@ static gint GnomeAngleMenu( gpointer p_data, GtkWidget * p_angle,
          i_angle < p_intf->p_input->stream.p_selected_area->i_angle_nb ;
          i_angle++ )
     {
-        snprintf( psz_name, GNOME_ANGLE_MENU_SIZE, "Angle %d", i_angle + 1 );
-        psz_name[ GNOME_ANGLE_MENU_SIZE - 1 ] = '\0';
+        snprintf( psz_name, GNOME_MENU_LABEL_SIZE, "Angle %d", i_angle + 1 );
+        psz_name[ GNOME_MENU_LABEL_SIZE - 1 ] = '\0';
 
         p_item = gtk_radio_menu_item_new_with_label( p_angle_group,
                                                      psz_name );
@@ -624,7 +622,7 @@ static gint GnomeChapterMenu( gpointer p_data, GtkWidget * p_chapter,
                         void(*pf_toggle )( GtkCheckMenuItem *, gpointer ) )
 {
     intf_thread_t *     p_intf;
-    char                psz_name[12];
+    char                psz_name[ GNOME_MENU_LABEL_SIZE ];
     GtkWidget *         p_chapter_menu;
     GtkWidget *         p_chapter_submenu;
     GtkWidget *         p_menu_item;
@@ -635,10 +633,10 @@ static gint GnomeChapterMenu( gpointer p_data, GtkWidget * p_chapter,
     gint                i_chapter;
     gint                i_nb;
 
-    /* cast */
+    /* Cast */
     p_intf = (intf_thread_t*)p_data;
 
-    /* removes previous menu */
+    /* Removes previous menu */
     gtk_menu_item_remove_submenu( GTK_MENU_ITEM( p_chapter ) );
     gtk_widget_set_sensitive( p_chapter, FALSE );
 
@@ -663,17 +661,17 @@ static gint GnomeChapterMenu( gpointer p_data, GtkWidget * p_chapter,
                 gtk_menu_append( GTK_MENU( p_chapter_menu ), p_menu_item );
             }
 
-            snprintf( psz_name, GNOME_ANGLE_MENU_SIZE,
+            snprintf( psz_name, GNOME_MENU_LABEL_SIZE,
                       "%d - %d", i_chapter + 1, i_chapter + 10);
-            psz_name[ GNOME_ANGLE_MENU_SIZE - 1 ] = '\0';
+            psz_name[ GNOME_MENU_LABEL_SIZE - 1 ] = '\0';
             p_menu_item = gtk_menu_item_new_with_label( psz_name );
             gtk_widget_show( p_menu_item );
             p_chapter_submenu = gtk_menu_new();
         }
 
-        snprintf( psz_name, GNOME_ANGLE_MENU_SIZE,
+        snprintf( psz_name, GNOME_MENU_LABEL_SIZE,
                   "Chapter %d", i_chapter + 1 );
-        psz_name[ GNOME_ANGLE_MENU_SIZE - 1 ] = '\0';
+        psz_name[ GNOME_MENU_LABEL_SIZE - 1 ] = '\0';
 
         p_item = gtk_radio_menu_item_new_with_label( p_chapter_group,
                                                      psz_name );
@@ -742,9 +740,8 @@ static gint GnomeTitleMenu( gpointer       p_data,
                             GtkWidget *    p_navigation, 
                             void(*pf_toggle )( GtkCheckMenuItem *, gpointer ) )
 {
-#define GNOME_TITLE_MENU_SIZE 64
     intf_thread_t *     p_intf;
-    char                psz_name[ GNOME_TITLE_MENU_SIZE ];
+    char                psz_name[ GNOME_MENU_LABEL_SIZE ];
     GtkWidget *         p_title_menu;
     GtkWidget *         p_title_submenu;
     GtkWidget *         p_title_item;
@@ -791,17 +788,17 @@ static gint GnomeTitleMenu( gpointer       p_data,
                 gtk_menu_append( GTK_MENU( p_title_menu ), p_title_menu_item );
             }
 
-            snprintf( psz_name, GNOME_TITLE_MENU_SIZE,
+            snprintf( psz_name, GNOME_MENU_LABEL_SIZE,
                       "%d - %d", i_title, i_title + 9 );
-            psz_name[ GNOME_TITLE_MENU_SIZE - 1 ] = '\0';
+            psz_name[ GNOME_MENU_LABEL_SIZE - 1 ] = '\0';
             p_title_menu_item = gtk_menu_item_new_with_label( psz_name );
             gtk_widget_show( p_title_menu_item );
             p_title_submenu = gtk_menu_new();
         }
 
-        snprintf( psz_name, GNOME_TITLE_MENU_SIZE, "Title %d (%d)", i_title,
+        snprintf( psz_name, GNOME_MENU_LABEL_SIZE, "Title %d (%d)", i_title,
                   p_intf->p_input->stream.pp_areas[i_title]->i_part_nb );
-        psz_name[ GNOME_TITLE_MENU_SIZE - 1 ] = '\0';
+        psz_name[ GNOME_MENU_LABEL_SIZE - 1 ] = '\0';
 
         if( pf_toggle == on_menubar_title_toggle )
         {
@@ -850,18 +847,18 @@ static gint GnomeTitleMenu( gpointer       p_data,
                                          p_chapter_menu_item );
                     }
 
-                    snprintf( psz_name, GNOME_TITLE_MENU_SIZE,
+                    snprintf( psz_name, GNOME_MENU_LABEL_SIZE,
                               "%d - %d", i_chapter + 1, i_chapter + 10 );
-                    psz_name[ GNOME_TITLE_MENU_SIZE - 1 ] = '\0';
+                    psz_name[ GNOME_MENU_LABEL_SIZE - 1 ] = '\0';
                     p_chapter_menu_item =
                             gtk_menu_item_new_with_label( psz_name );
                     gtk_widget_show( p_chapter_menu_item );
                     p_chapter_submenu = gtk_menu_new();
                 }
 
-                snprintf( psz_name, GNOME_TITLE_MENU_SIZE,
+                snprintf( psz_name, GNOME_MENU_LABEL_SIZE,
                           "Chapter %d", i_chapter + 1 );
-                psz_name[ GNOME_TITLE_MENU_SIZE - 1 ] = '\0';
+                psz_name[ GNOME_MENU_LABEL_SIZE - 1 ] = '\0';
     
                 p_item = gtk_radio_menu_item_new_with_label(
                                                 p_chapter_group, psz_name );
@@ -970,7 +967,7 @@ static gint GnomeSetupMenu( intf_thread_t * p_intf )
                             p_intf->p_sys->p_window ), "menubar_title" ) );
         GnomeTitleMenu( p_intf, p_menubar_menu, on_menubar_title_toggle );
 
-        snprintf( psz_title, 5, "%d",
+        snprintf( psz_title, 4, "%d",
                   p_intf->p_input->stream.p_selected_area->i_id );
         psz_title[ 4 ] = '\0';
         gtk_label_set_text( p_intf->p_sys->p_label_title, psz_title );
@@ -990,7 +987,7 @@ static gint GnomeSetupMenu( intf_thread_t * p_intf )
                              p_intf->p_sys->p_window ), "menubar_chapter" ) );
         GnomeChapterMenu( p_intf, p_menubar_menu, on_menubar_chapter_toggle );
 
-        snprintf( psz_chapter, 5, "%d", 
+        snprintf( psz_chapter, 4, "%d", 
                   p_intf->p_input->stream.p_selected_area->i_part );
         psz_chapter[ 4 ] = '\0';
         gtk_label_set_text( p_intf->p_sys->p_label_chapter, psz_chapter );

diff --git a/plugins/gnome/intf_gnome.h b/plugins/gnome/intf_gnome.h
index 42102769e6a416a172847a31b347a5994d4bf242..861374253d1a11368a1de9d58bae636003fbebae 100644 (file)
--- a/plugins/gnome/intf_gnome.h
+++ b/plugins/gnome/intf_gnome.h
@@ -2,7 +2,7 @@
  * intf_gnome.h: private Gnome interface description
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: intf_gnome.h,v 1.8 2001/04/22 00:08:26 stef Exp $
+ * $Id: intf_gnome.h,v 1.9 2001/05/01 15:12:22 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -22,19 +22,24 @@
  *****************************************************************************/
 
 /*****************************************************************************
- * drag'n'drop stuff
+ * Drag'n'drop stuff
  *****************************************************************************/
 #define DROP_ACCEPT_TEXT_URI_LIST  0
 #define DROP_ACCEPT_TEXT_PLAIN     1
 
 /*****************************************************************************
- * interface modes
+ * Interface modes
  *****************************************************************************/
 #define FILE_MODE   0
 #define NET_MODE    1
 #define DVD_MODE    2
 #define VCD_MODE    3
 
+/*****************************************************************************
+ * String sizes
+ *****************************************************************************/
+#define GNOME_MENU_LABEL_SIZE 64
+
 /*****************************************************************************
  * intf_sys_t: description and status of Gnome interface
  *****************************************************************************/
@@ -83,3 +88,4 @@ typedef struct intf_sys_s
     void             ( *pf_gdk_callback ) ( void );
 
 } intf_sys_t;
+

diff --git a/plugins/gtk/intf_gtk.c b/plugins/gtk/intf_gtk.c
index 97ea5e174682ed4062d5e8d17e430f47b0247b75..040b8aefe37b2b8e227c5bfcbe34c5738c8a5118 100644 (file)
--- a/plugins/gtk/intf_gtk.c
+++ b/plugins/gtk/intf_gtk.c
@@ -2,7 +2,7 @@
  * intf_gtk.c: Gtk+ interface
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: intf_gtk.c,v 1.14 2001/04/27 16:08:26 sam Exp $
+ * $Id: intf_gtk.c,v 1.15 2001/05/01 15:12:22 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Stéphane Borel <stef@via.ecp.fr>
@@ -603,7 +603,7 @@ static gint GtkChapterMenu( gpointer p_data, GtkWidget * p_chapter,
                         void(*pf_activate )( GtkMenuItem *, gpointer ) )
 {
     intf_thread_t *     p_intf;
-    char                psz_name[10];
+    char                psz_name[ GTK_MENU_LABEL_SIZE ];
     GtkWidget *         p_chapter_menu;
     GtkWidget *         p_item;
     GSList *            p_chapter_button_group;
@@ -624,7 +624,9 @@ static gint GtkChapterMenu( gpointer p_data, GtkWidget * p_chapter,
         b_active = ( p_intf->p_input->stream.pp_areas[i_title]->i_part
                      == i_chapter + 1 ) ? 1 : 0;
         
-        sprintf( psz_name, "Chapter %d", i_chapter + 1 );
+        snprintf( psz_name, GTK_MENU_LABEL_SIZE,
+                  "Chapter %d", i_chapter + 1 );
+        psz_name[ GTK_MENU_LABEL_SIZE - 1 ] = '\0';
 
         p_item = GtkMenuRadioItem( p_chapter_menu, &p_chapter_button_group,
                                    b_active, psz_name );
@@ -657,7 +659,7 @@ static gint GtkTitleMenu( gpointer       p_data,
                           void(*pf_activate )( GtkMenuItem *, gpointer ) )
 {
     intf_thread_t *     p_intf;
-    char                psz_name[10];
+    char                psz_name[ GTK_MENU_LABEL_SIZE ];
     GtkWidget *         p_title_menu;
     GtkWidget *         p_title_item;
     GtkWidget *         p_chapter_menu;
@@ -682,7 +684,8 @@ static gint GtkTitleMenu( gpointer       p_data,
     {
         b_active = ( p_intf->p_input->stream.pp_areas[i_title] ==
                      p_intf->p_input->stream.p_selected_area ) ? 1 : 0;
-        sprintf( psz_name, "Title %d", i_title );
+        snprintf( psz_name, GTK_MENU_LABEL_SIZE, "Title %d", i_title );
+        psz_name[ GTK_MENU_LABEL_SIZE - 1 ] = '\0';
 
         p_title_item = GtkMenuRadioItem( p_title_menu, &p_title_button_group,
                                          b_active, psz_name );
@@ -707,7 +710,9 @@ static gint GtkTitleMenu( gpointer       p_data,
                 b_active = ( p_intf->p_input->stream.pp_areas[i_title]->i_part
                              == i_chapter + 1 ) ? 1 : 0;
                 
-                sprintf( psz_name, "Chapter %d", i_chapter + 1 );
+                snprintf( psz_name, GTK_MENU_LABEL_SIZE,
+                          "Chapter %d", i_chapter + 1 );
+                psz_name[ GTK_MENU_LABEL_SIZE - 1 ] = '\0';
     
                 p_item = GtkMenuRadioItem( p_chapter_menu,
                                            &p_chapter_button_group,

diff --git a/plugins/gtk/intf_gtk.h b/plugins/gtk/intf_gtk.h
index 30f9f9ae5ed129e075ffe1934510939f08e45a56..67e07f1c07d3ac8ba07606d04744919c5601cdfb 100644 (file)
--- a/plugins/gtk/intf_gtk.h
+++ b/plugins/gtk/intf_gtk.h
@@ -2,7 +2,7 @@
  * intf_gtk.h: private Gtk+ interface description
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: intf_gtk.h,v 1.1 2001/03/15 01:42:20 sam Exp $
+ * $Id: intf_gtk.h,v 1.2 2001/05/01 15:12:22 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -22,13 +22,18 @@
  *****************************************************************************/
 
 /*****************************************************************************
- * drag'n'drop stuff
+ * Drag'n'drop stuff
  *****************************************************************************/
 #define DROP_ACCEPT_TEXT_URI_LIST  0
 #define DROP_ACCEPT_TEXT_PLAIN     1
 
 /*****************************************************************************
- * useful inline function
+ * String sizes
+ *****************************************************************************/
+#define GTK_MENU_LABEL_SIZE 64
+
+/*****************************************************************************
+ * Useful inline function
  ****************************************************************************/
 static __inline__ intf_thread_t * GetIntf( GtkWidget *item, char * psz_parent )
 {

diff --git a/src/video_parser/video_parser.c b/src/video_parser/video_parser.c
index eeb5a72962d8f9236863a4c0cf4941ba4d9d44ad..d478efaf2cd275cbf088815f19b5f18b16d0256c 100644 (file)
--- a/src/video_parser/video_parser.c
+++ b/src/video_parser/video_parser.c
@@ -2,7 +2,7 @@
  * video_parser.c : video parser thread
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: video_parser.c,v 1.83 2001/05/01 12:22:18 sam Exp $
+ * $Id: video_parser.c,v 1.84 2001/05/01 15:12:22 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Samuel Hocevar <sam@via.ecp.fr>
@@ -94,6 +94,7 @@ vlc_thread_t vpar_CreateThread( vdec_config_t * p_config )
      */
     p_vpar->p_fifo = p_config->decoder_config.p_decoder_fifo;
     p_vpar->p_config = p_config;
+    p_vpar->p_vout = NULL;
 
     /*
      * Choose the best motion compensation module

diff --git a/src/video_parser/vpar_headers.c b/src/video_parser/vpar_headers.c
index 2c87349184db2505269dbf8c56a84f3c18f99302..df7167876e8bbc5fb6020805a72e867d39d3794c 100644 (file)
--- a/src/video_parser/vpar_headers.c
+++ b/src/video_parser/vpar_headers.c
@@ -2,7 +2,7 @@
  * vpar_headers.c : headers parsing
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: vpar_headers.c,v 1.84 2001/05/01 12:22:18 sam Exp $
+ * $Id: vpar_headers.c,v 1.85 2001/05/01 15:12:22 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Stéphane Borel <stef@via.ecp.fr>
@@ -458,6 +458,9 @@ static void SequenceHeader( vpar_thread_t * p_vpar )
         {
             intf_Msg( "vpar: no vout present, spawning one" );
             p_main->p_vout = vout_CreateThread( NULL );
+
+            /* Spawning another one for fun */
+            //vout_CreateThread( NULL );
         }
 
         p_vpar->p_vout = p_main->p_vout;