Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
2b08072c
Commit
2b08072c
authored
Sep 17, 2008
by
Pierre d'Herbemont
Committed by
Jean-Baptiste Kempf
Sep 16, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
es_format: Robustification of es_format_copy to avoid a crash reported by Apple-bugreport.
(cherry picked from commit
fedbcd7f
)
parent
d65ef91e
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
31 additions
and
19 deletions
+31
-19
src/misc/es_format.c
src/misc/es_format.c
+31
-19
No files found.
src/misc/es_format.c
View file @
2b08072c
...
...
@@ -157,15 +157,16 @@ int es_format_Copy( es_format_t *dst, const es_format_t *src )
{
int
i
;
memcpy
(
dst
,
src
,
sizeof
(
es_format_t
)
);
if
(
src
->
psz_language
)
dst
->
psz_language
=
strdup
(
src
->
psz_language
);
if
(
src
->
psz_description
)
dst
->
psz_description
=
strdup
(
src
->
psz_description
);
if
(
src
->
i_extra
>
0
)
dst
->
psz_language
=
src
->
psz_language
?
strdup
(
src
->
psz_language
)
:
NULL
;
dst
->
psz_description
=
src
->
psz_description
?
strdup
(
src
->
psz_description
)
:
NULL
;
if
(
src
->
i_extra
>
0
&&
dst
->
p_extra
)
{
dst
->
i_extra
=
src
->
i_extra
;
dst
->
p_extra
=
malloc
(
src
->
i_extra
);
if
(
dst
->
p_extra
)
memcpy
(
dst
->
p_extra
,
src
->
p_extra
,
src
->
i_extra
);
else
dst
->
i_extra
=
0
;
}
else
{
...
...
@@ -173,21 +174,26 @@ int es_format_Copy( es_format_t *dst, const es_format_t *src )
dst
->
p_extra
=
NULL
;
}
if
(
src
->
subs
.
psz_encoding
)
dst
->
subs
.
psz_encoding
=
strdup
(
src
->
subs
.
psz_encoding
);
dst
->
subs
.
psz_encoding
=
dst
->
subs
.
psz_encoding
?
strdup
(
src
->
subs
.
psz_encoding
)
:
NULL
;
if
(
src
->
video
.
p_palette
)
{
dst
->
video
.
p_palette
=
(
video_palette_t
*
)
malloc
(
sizeof
(
video_palette_t
)
);
if
(
dst
->
video
.
p_palette
)
{
memcpy
(
dst
->
video
.
p_palette
,
src
->
video
.
p_palette
,
sizeof
(
video_palette_t
)
);
}
}
if
(
dst
->
i_extra_languages
&&
src
->
p_extra_languages
)
{
dst
->
i_extra_languages
=
src
->
i_extra_languages
;
if
(
dst
->
i_extra_languages
)
dst
->
p_extra_languages
=
(
extra_languages_t
*
)
malloc
(
dst
->
i_extra_languages
*
sizeof
(
*
dst
->
p_extra_languages
));
if
(
dst
->
p_extra_languages
)
{
for
(
i
=
0
;
i
<
dst
->
i_extra_languages
;
i
++
)
{
if
(
src
->
p_extra_languages
[
i
].
psz_language
)
dst
->
p_extra_languages
[
i
].
psz_language
=
strdup
(
src
->
p_extra_languages
[
i
].
psz_language
);
...
...
@@ -198,6 +204,12 @@ int es_format_Copy( es_format_t *dst, const es_format_t *src )
else
dst
->
p_extra_languages
[
i
].
psz_description
=
NULL
;
}
}
else
dst
->
i_extra_languages
=
0
;
}
else
dst
->
i_extra_languages
=
0
;
return
VLC_SUCCESS
;
}
...
...
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