Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-1.1
Commits
ed646f0f
Commit
ed646f0f
authored
Oct 18, 2005
by
Derk-Jan Hartman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* Don't crash if we cannot retrieve a directory in which to search.
parent
1d135a80
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
1 deletion
+9
-1
src/input/subtitles.c
src/input/subtitles.c
+9
-1
No files found.
src/input/subtitles.c
View file @
ed646f0f
...
@@ -288,6 +288,8 @@ char **subtitles_Detect( input_thread_t *p_this, char *psz_path,
...
@@ -288,6 +288,8 @@ char **subtitles_Detect( input_thread_t *p_this, char *psz_path,
char
*
psz_fname_original
=
strdup
(
psz_name
);
char
*
psz_fname_original
=
strdup
(
psz_name
);
char
*
psz_fname
=
psz_fname_original
;
char
*
psz_fname
=
psz_fname_original
;
if
(
psz_fname
==
NULL
)
return
NULL
;
if
(
!
strncmp
(
psz_fname
,
"file://"
,
7
)
)
if
(
!
strncmp
(
psz_fname
,
"file://"
,
7
)
)
{
{
psz_fname
+=
7
;
psz_fname
+=
7
;
...
@@ -312,7 +314,10 @@ char **subtitles_Detect( input_thread_t *p_this, char *psz_path,
...
@@ -312,7 +314,10 @@ char **subtitles_Detect( input_thread_t *p_this, char *psz_path,
}
}
else
else
{
{
f_fname
=
strdup
(
psz_fname
);
/* FIXME: we should check the CWD here */
/* f_fname = strdup( psz_fname ); */
if
(
psz_fname_original
)
free
(
psz_fname_original
);
return
NULL
;
}
}
i_fname_len
=
strlen
(
f_fname
);
i_fname_len
=
strlen
(
f_fname
);
...
@@ -337,6 +342,9 @@ char **subtitles_Detect( input_thread_t *p_this, char *psz_path,
...
@@ -337,6 +342,9 @@ char **subtitles_Detect( input_thread_t *p_this, char *psz_path,
pp_dir_content
=
NULL
;
pp_dir_content
=
NULL
;
i_dir_content
=
0
;
i_dir_content
=
0
;
if
(
j
<
0
&&
f_dir
==
NULL
)
continue
;
/* parse psz_src dir */
/* parse psz_src dir */
if
(
(
i_dir_content
=
scandir
(
j
<
0
?
f_dir
:
*
subdirs
,
&
pp_dir_content
,
Filter
,
if
(
(
i_dir_content
=
scandir
(
j
<
0
?
f_dir
:
*
subdirs
,
&
pp_dir_content
,
Filter
,
NULL
)
)
!=
-
1
)
NULL
)
)
!=
-
1
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment