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
fffce3a3
Commit
fffce3a3
authored
Feb 27, 2010
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed segfault when seeking in ASF with broken index.
It closes #2272 and #3350.
parent
b4f08e46
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
29 additions
and
19 deletions
+29
-19
modules/demux/asf/asf.c
modules/demux/asf/asf.c
+29
-19
No files found.
modules/demux/asf/asf.c
View file @
fffce3a3
...
...
@@ -233,24 +233,30 @@ static int SeekPercent( demux_t *p_demux, int i_query, va_list args )
p_sys
->
p_fp
->
i_min_data_packet_size
,
i_query
,
args
);
}
static
int
SeekIndex
(
demux_t
*
p_demux
,
mtime_t
i_date
,
float
f_pos
)
{
demux_sys_t
*
p_sys
=
p_demux
->
p_sys
;
asf_object_index_t
*
p_index
;
int64_t
i_pos
;
msg_Dbg
(
p_demux
,
"seek with index: %i seconds, position %f"
,
i_date
>=
0
?
(
int
)(
i_date
/
1000000
)
:
-
1
,
f_pos
);
p_index
=
ASF_FindObject
(
p_sys
->
p_root
,
&
asf_object_index_guid
,
0
);
if
(
i_date
<
0
)
i_date
=
p_sys
->
i_length
*
f_pos
;
if
(
i_date
<
0
)
i_date
=
p_sys
->
i_length
*
f_pos
;
p_index
=
ASF_FindObject
(
p_sys
->
p_root
,
&
asf_object_index_guid
,
0
)
;
i_pos
=
i_date
*
10
/
p_index
->
i_index_entry_time_interval
;
i_pos
=
p_index
->
index_entry
[
i_pos
].
i_packet_number
*
p_sys
->
p_fp
->
i_min_data_packet_size
;
uint64_t
i_entry
=
i_date
*
10
/
p_index
->
i_index_entry_time_interval
;
if
(
i_entry
>=
p_index
->
i_index_entry_count
)
{
msg_Warn
(
p_demux
,
"Incomplete index"
);
return
VLC_EGENERIC
;
}
return
stream_Seek
(
p_demux
->
s
,
p_sys
->
i_data_begin
+
i_pos
);
uint64_t
i_offset
=
(
uint64_t
)
p_index
->
index_entry
[
i_entry
].
i_packet_number
*
p_sys
->
p_fp
->
i_min_data_packet_size
;
return
stream_Seek
(
p_demux
->
s
,
p_sys
->
i_data_begin
+
i_offset
);
}
static
void
SeekPrepare
(
demux_t
*
p_demux
)
...
...
@@ -299,13 +305,15 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
if
(
p_sys
->
b_index
&&
p_sys
->
i_length
>
0
)
{
i64
=
(
int64_t
)
va_arg
(
args
,
int64_t
);
return
SeekIndex
(
p_demux
,
i64
,
-
1
);
}
else
{
return
SeekPercent
(
p_demux
,
i_query
,
args
);
va_list
acpy
;
va_copy
(
acpy
,
args
);
i64
=
(
int64_t
)
va_arg
(
acpy
,
int64_t
);
va_end
(
acpy
);
if
(
!
SeekIndex
(
p_demux
,
i64
,
-
1
)
)
return
VLC_SUCCESS
;
}
return
SeekPercent
(
p_demux
,
i_query
,
args
);
case
DEMUX_GET_POSITION
:
if
(
p_sys
->
i_time
<
0
)
return
VLC_EGENERIC
;
...
...
@@ -325,13 +333,15 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
if
(
p_sys
->
b_index
&&
p_sys
->
i_length
>
0
)
{
f
=
(
double
)
va_arg
(
args
,
double
);
return
SeekIndex
(
p_demux
,
-
1
,
f
);
}
else
{
return
SeekPercent
(
p_demux
,
i_query
,
args
);
va_list
acpy
;
va_copy
(
acpy
,
args
);
f
=
(
double
)
va_arg
(
acpy
,
double
);
va_end
(
acpy
);
if
(
!
SeekIndex
(
p_demux
,
-
1
,
f
)
)
return
VLC_SUCCESS
;
}
return
SeekPercent
(
p_demux
,
i_query
,
args
);
case
DEMUX_GET_META
:
p_meta
=
(
vlc_meta_t
*
)
va_arg
(
args
,
vlc_meta_t
*
);
...
...
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