Skip to content

V
vlc
Commit 811ce44f authored by Rafaël Carré's avatar Rafaël Carré Committed by Jean-Baptiste Kempf
Browse files
Options

bluray: don't crash when file is NULL 

e.g. vlc bluray://0Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 61d512e9
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
modules/access/bluray.c
View file @ 811ce44f
...@@ -94,7 +94,7 @@ static int blurayOpen( vlc_object_t *object ) ...@@ -94,7 +94,7 @@ static int blurayOpen( vlc_object_t *object )
char *pos_title; char *pos_title;
int i_title = -1; int i_title = -1;
char bd_path[PATH_MAX]; char bd_path[PATH_MAX] = { '\0' };
const char *error_msg = NULL; const char *error_msg = NULL;
if (strcmp(p_demux->psz_access, "bluray")) { if (strcmp(p_demux->psz_access, "bluray")) {
...@@ -117,8 +117,10 @@ static int blurayOpen( vlc_object_t *object ) ...@@ -117,8 +117,10 @@ static int blurayOpen( vlc_object_t *object )
TAB_INIT( p_sys->i_title, p_sys->pp_title ); TAB_INIT( p_sys->i_title, p_sys->pp_title );
/* store current bd_path */ /* store current bd_path */
if (p_demux->psz_file) {
strncpy(bd_path, p_demux->psz_file, sizeof(bd_path)); strncpy(bd_path, p_demux->psz_file, sizeof(bd_path));
bd_path[PATH_MAX - 1] = '\0'; bd_path[PATH_MAX - 1] = '\0';
}
p_sys->bluray = bd_open(bd_path, NULL); p_sys->bluray = bd_open(bd_path, NULL);
if (!p_sys->bluray) { if (!p_sys->bluray) {
......
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