Fixed a potential packet corruption in the DVD input (I suspect this

might be the cause of the OS X problem - please confirm).

diff --git a/extras/libdvdcss/libdvdcss.c b/extras/libdvdcss/libdvdcss.c
index 987de9980dbfd3f199bebf6724a4a651646c4dce..947c1e945559a2b036053cd051ea2b379c24f5dc 100644 (file)
--- a/extras/libdvdcss/libdvdcss.c
+++ b/extras/libdvdcss/libdvdcss.c
@@ -2,7 +2,7 @@
  * libdvdcss.c: DVD reading library.
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: libdvdcss.c,v 1.23 2001/11/26 15:56:36 massiot Exp $
+ * $Id: libdvdcss.c,v 1.24 2001/11/27 10:18:33 massiot Exp $
  *
  * Authors: Stéphane Borel <stef@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -490,11 +490,14 @@ static int _dvdcss_raw_open ( dvdcss_handle dvdcss, char *psz_target )
     if( dvdcss->i_raw_fd == -1 )
     {
         _dvdcss_error( dvdcss, "failed opening raw device, continuing" );
+        return -1;
     }
     else
     {
         dvdcss->i_read_fd = dvdcss->i_raw_fd;
     }
+
+    return 0;
 }
 #endif
 

diff --git a/src/input/input_netlist.c b/src/input/input_netlist.c
index b4765e70f019aea40fe94127bf08ef0f82188f34..0148bf7ecee88d99318eae594f27bb4ca3346266 100644 (file)
--- a/src/input/input_netlist.c
+++ b/src/input/input_netlist.c
@@ -6,7 +6,7 @@
  * will only be given back to netlist when refcount is zero.
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000, 2001 VideoLAN
- * $Id: input_netlist.c,v 1.43 2001/11/11 01:32:03 stef Exp $
+ * $Id: input_netlist.c,v 1.44 2001/11/27 10:18:33 massiot Exp $
  *
  * Authors: Henri Fallon <henri@videolan.org>
  *          Stéphane Borel <stef@videolan.org>
@@ -363,6 +363,14 @@ void input_NetlistMviovec( void * p_method_data, int i_nb_iovec,
         pp_data[i_loop]->p_buffer =
                     p_netlist->p_free_iovec[p_netlist->i_iovec_start].iov_base;
         
+        pp_data[i_loop]->p_payload_start = pp_data[i_loop]->p_buffer;
+
+        pp_data[i_loop]->p_payload_end =
+                  pp_data[i_loop]->p_buffer + p_netlist->i_buffer_size;
+
+        pp_data[i_loop]->p_next = NULL;
+        pp_data[i_loop]->b_discard_payload = 0;
+
         pp_data[i_loop]->pi_refcount = p_netlist->pi_refcount +
                                        p_netlist->i_iovec_start;
         (*pp_data[i_loop]->pi_refcount)++;
@@ -408,6 +416,14 @@ struct data_packet_s * input_NetlistNewPtr( void * p_method_data )
     p_netlist->i_data_start++;
     p_netlist->i_data_start &= p_netlist->i_nb_data;
 
+    p_return->p_payload_start = p_return->p_buffer;
+
+    p_return->p_payload_end =
+              p_return->p_buffer + p_netlist->i_buffer_size;
+
+    p_return->p_next = NULL;
+    p_return->b_discard_payload = 0;
+
     /* unlock */
     vlc_mutex_unlock (&p_netlist->lock);