Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
60672abc
Commit
60672abc
authored
Nov 28, 2006
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Avoid duplicate memory allocation
parent
a9ac3e9e
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
modules/access/directory.c
modules/access/directory.c
+4
-4
No files found.
modules/access/directory.c
View file @
60672abc
...
@@ -393,9 +393,8 @@ static int ReadDir( playlist_t *p_playlist, const char *psz_name,
...
@@ -393,9 +393,8 @@ static int ReadDir( playlist_t *p_playlist, const char *psz_name,
{
{
const
char
*
entry
=
pp_dir_content
[
i
];
const
char
*
entry
=
pp_dir_content
[
i
];
int
i_size_entry
=
strlen
(
psz_name
)
+
int
i_size_entry
=
strlen
(
psz_name
)
+
strlen
(
entry
)
+
2
;
strlen
(
entry
)
+
2
+
7
/* strlen("file://") */
;
char
psz_uri
[
i_size_entry
];
char
psz_uri
[
i_size_entry
];
char
psz_mrl
[
i_size_entry
+
7
];
/* "file://psz_uri" */
sprintf
(
psz_uri
,
"%s/%s"
,
psz_name
,
entry
);
sprintf
(
psz_uri
,
"%s/%s"
,
psz_name
,
entry
);
...
@@ -472,9 +471,10 @@ static int ReadDir( playlist_t *p_playlist, const char *psz_name,
...
@@ -472,9 +471,10 @@ static int ReadDir( playlist_t *p_playlist, const char *psz_name,
}
}
}
}
sprintf
(
&
psz_mrl
,
"file://%s"
,
psz_uri
);
memmove
(
psz_uri
+
7
,
psz_uri
,
sizeof
(
psz_uri
)
-
7
);
memcpy
(
psz_uri
,
"file://"
,
7
);
p_input
=
input_ItemNewWithType
(
VLC_OBJECT
(
p_playlist
),
p_input
=
input_ItemNewWithType
(
VLC_OBJECT
(
p_playlist
),
psz_
mrl
,
entry
,
0
,
NULL
,
psz_
uri
,
entry
,
0
,
NULL
,
-
1
,
ITEM_TYPE_VFILE
);
-
1
,
ITEM_TYPE_VFILE
);
if
(
p_input
!=
NULL
)
if
(
p_input
!=
NULL
)
{
{
...
...
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