Commit 187982c2 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

* Use vlc_closedir_wrapper where utf8_opendir was used. Should fix mkv crashes on windows.

  refs #880
parent 0a49b677
...@@ -253,7 +253,7 @@ int E_(ParseDirectory)( intf_thread_t *p_intf, char *psz_root, ...@@ -253,7 +253,7 @@ int E_(ParseDirectory)( intf_thread_t *p_intf, char *psz_root,
if( !f->name ) if( !f->name )
{ {
msg_Err( p_intf , "unable to parse directory" ); msg_Err( p_intf , "unable to parse directory" );
closedir( p_dir ); vlc_closedir_wrapper( p_dir );
free( f ); free( f );
return( VLC_ENOMEM ); return( VLC_ENOMEM );
} }
......
...@@ -1548,7 +1548,7 @@ static int Open( vlc_object_t * p_this ) ...@@ -1548,7 +1548,7 @@ static int Open( vlc_object_t * p_this )
} }
free (psz_file); free (psz_file);
} }
closedir( p_src_dir ); vlc_closedir_wrapper( p_src_dir );
} }
} }
......
...@@ -2009,7 +2009,7 @@ static void ReadDir( intf_thread_t *p_intf ) ...@@ -2009,7 +2009,7 @@ static void ReadDir( intf_thread_t *p_intf )
qsort( p_sys->pp_dir_entries, p_sys->i_dir_entries, qsort( p_sys->pp_dir_entries, p_sys->i_dir_entries,
sizeof(struct dir_entry_t*), &comp_dir_entries ); sizeof(struct dir_entry_t*), &comp_dir_entries );
closedir( p_current_dir ); vlc_closedir_wrapper( p_current_dir );
return; return;
} }
else else
......
...@@ -573,7 +573,7 @@ gnutls_Addx509Directory( vlc_object_t *p_this, ...@@ -573,7 +573,7 @@ gnutls_Addx509Directory( vlc_object_t *p_this,
|| fstat( fd, &st1 ) || utf8_lstat( psz_dirname, &st2 ) || fstat( fd, &st1 ) || utf8_lstat( psz_dirname, &st2 )
|| S_ISLNK( st2.st_mode ) || ( st1.st_ino != st2.st_ino ) ) || S_ISLNK( st2.st_mode ) || ( st1.st_ino != st2.st_ino ) )
{ {
closedir( dir ); vlc_closedir_wrapper( dir );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
} }
...@@ -598,7 +598,7 @@ gnutls_Addx509Directory( vlc_object_t *p_this, ...@@ -598,7 +598,7 @@ gnutls_Addx509Directory( vlc_object_t *p_this,
free( psz_filename ); free( psz_filename );
} }
closedir( dir ); vlc_closedir_wrapper( dir );
return VLC_SUCCESS; return VLC_SUCCESS;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment