bluray: blurayInitTitles: fix memleaks on error paths

[vlc] / modules / access / gnomevfs.c

diff --git a/modules/access/gnomevfs.c b/modules/access/gnomevfs.c
index b9eebf7070cbd78f38f284545a375e677de7318a..1f0db8cb5eec1723438a5f005985a0c489fa6c13 100644 (file)
--- a/modules/access/gnomevfs.c
+++ b/modules/access/gnomevfs.c
@@ -1,24 +1,24 @@
 /*****************************************************************************
  * gnomevfs.c: GnomeVFS input
  *****************************************************************************
- * Copyright (C) 2005 the VideoLAN team
+ * Copyright (C) 2005 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Benjamin Pracht <bigben -AT- videolan -DOT- org>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -63,7 +63,6 @@ static int     Control( access_t *, int, va_list );
 
 struct access_sys_t
 {
-    unsigned int i_nb_reads;
     char *psz_name;
 
     GnomeVFSHandle *p_handle;
@@ -105,7 +104,6 @@ static int Open( vlc_object_t *p_this )
     STANDARD_READ_ACCESS_INIT;
 
     p_sys->p_handle = p_handle;
-    p_sys->i_nb_reads = 0;
     p_sys->b_pace_control = true;
 
     if( strcmp( "gnomevfs", p_access->psz_access ) &&
@@ -215,7 +213,6 @@ static int Open( vlc_object_t *p_this )
         p_sys->p_file_info->type == GNOME_VFS_FILE_TYPE_BLOCK_DEVICE )
     {
         p_sys->b_seekable = true;
-        p_access->info.i_size = (int64_t)(p_sys->p_file_info->size);
     }
     else if( p_sys->p_file_info->type == GNOME_VFS_FILE_TYPE_FIFO
               || p_sys->p_file_info->type == GNOME_VFS_FILE_TYPE_SOCKET )
@@ -228,7 +225,7 @@ static int Open( vlc_object_t *p_this )
         return VLC_EGENERIC;
     }
 
-    if( p_sys->b_seekable && !p_access->info.i_size )
+    if( p_sys->b_seekable && !p_sys->p_file_info->size )
     {
         /* FIXME that's bad because all others access will be probed */
         msg_Warn( p_access, "file %s is empty, aborting", psz_name );
@@ -288,35 +285,17 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len )
                                     gnome_vfs_result_to_string( i_ret ) );
         }
     }
-    else
-    {
-        p_sys->i_nb_reads++;
-        if( p_access->info.i_size != 0 &&
-            (p_sys->i_nb_reads % INPUT_FSTAT_NB_READS) == 0 &&
-            p_sys->b_local )
-        {
-            gnome_vfs_file_info_clear( p_sys->p_file_info );
-            i_ret = gnome_vfs_get_file_info_from_handle( p_sys->p_handle,
-                                                p_sys->p_file_info, 8 );
-            if( i_ret )
-            {
-                msg_Warn( p_access, "couldn't get file properties again (%s)",
-                                        gnome_vfs_result_to_string( i_ret ) );
-            }
-            else
-            {
-                p_access->info.i_size = (int64_t)(p_sys->p_file_info->size);
-            }
-        }
-    }
 
     p_access->info.i_pos += (int64_t)i_read_len;
-
-    /* Some Acces (http) never return EOF and loop on the file */
-    if( p_access->info.i_pos > p_access->info.i_size )
+    if( p_access->info.i_pos >= p_sys->p_file_info->size
+     && p_sys->p_file_info->size != 0 && p_sys->b_local )
     {
-        p_access->info.b_eof = true;
-        return 0;
+        gnome_vfs_file_info_clear( p_sys->p_file_info );
+        i_ret = gnome_vfs_get_file_info_from_handle( p_sys->p_handle,
+                                                     p_sys->p_file_info, 8 );
+        if( i_ret )
+            msg_Warn( p_access, "couldn't get file properties again (%s)",
+                      gnome_vfs_result_to_string( i_ret ) );
     }
     return (int)i_read_len;
 }
@@ -379,6 +358,10 @@ static int Control( access_t *p_access, int i_query, va_list args )
             *pb_bool = p_sys->b_pace_control;
             break;
 
+        case ACCESS_GET_SIZE:
+            *va_arg( args, uint64_t * ) = p_sys->p_file_info->size;
+            break;
+
         case ACCESS_GET_PTS_DELAY:
             pi_64 = (int64_t*)va_arg( args, int64_t * );
             *pi_64 = DEFAULT_PTS_DELAY; /* FIXME */