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
fc2e63a4
Commit
fc2e63a4
authored
Jul 02, 2008
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reworked a few broken int cast (and at least fixed a segfault).
parent
aec5639a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
6 deletions
+5
-6
modules/demux/asf/libasf.c
modules/demux/asf/libasf.c
+5
-6
No files found.
modules/demux/asf/libasf.c
View file @
fc2e63a4
...
...
@@ -283,11 +283,11 @@ static int ASF_ReadObject_Index( stream_t *s, asf_object_t *p_obj )
{
asf_object_index_t
*
p_index
=
&
p_obj
->
index
;
const
uint8_t
*
p_peek
;
int
i
;
unsigned
int
i
;
/* We just ignore error on the index */
if
(
stream_Peek
(
s
,
&
p_peek
,
p_index
->
i_object_size
)
<
__MAX
(
(
int
)
p_index
->
i_object_size
,
56
)
)
__MAX
(
(
int
64_t
)
p_index
->
i_object_size
,
56
)
)
return
VLC_SUCCESS
;
ASF_GetGUID
(
&
p_index
->
i_file_id
,
p_peek
+
24
);
...
...
@@ -316,8 +316,7 @@ static int ASF_ReadObject_Index( stream_t *s, asf_object_t *p_obj )
if
(
!
p_index
->
index_entry
)
return
VLC_ENOMEM
;
for
(
i
=
0
,
p_peek
+=
56
;
i
<
(
int
)
p_index
->
i_index_entry_count
;
i
++
,
p_peek
+=
6
)
for
(
i
=
0
,
p_peek
+=
56
;
i
<
p_index
->
i_index_entry_count
;
i
++
,
p_peek
+=
6
)
{
p_index
->
index_entry
[
i
].
i_packet_number
=
GetDWLE
(
p_peek
);
p_index
->
index_entry
[
i
].
i_packet_count
=
GetDWLE
(
p_peek
+
4
);
...
...
@@ -397,7 +396,7 @@ static int ASF_ReadObject_metadata( stream_t *s, asf_object_t *p_obj )
#endif
if
(
(
i_peek
=
stream_Peek
(
s
,
&
p_peek
,
p_meta
->
i_object_size
)
)
<
__MAX
(
(
int
)
p_meta
->
i_object_size
,
26
)
)
__MAX
(
(
int
64_t
)
p_meta
->
i_object_size
,
26
)
)
return
VLC_EGENERIC
;
p_meta
->
i_record_entries_count
=
GetWLE
(
p_peek
+
24
);
...
...
@@ -509,7 +508,7 @@ static int ASF_ReadObject_header_extension( stream_t *s, asf_object_t *p_obj )
p_he
->
i_header_extension_size
=
GetDWLE
(
p_peek
+
42
);
if
(
p_he
->
i_header_extension_size
)
{
if
(
i_peek
-
46
<
(
int
)
p_he
->
i_header_extension_size
)
if
(
(
unsigned
int
)(
i_peek
-
46
)
<
p_he
->
i_header_extension_size
)
return
VLC_EGENERIC
;
p_he
->
p_header_extension_data
=
...
...
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