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
fc9f8518
Commit
fc9f8518
authored
May 24, 2008
by
bl4
Committed by
Rafaël Carré
May 26, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mms/tcp: hanging or unexpected seeking after the end of stream
Signed-off-by:
Rafaël Carré
<
funman@videolan.org
>
parent
c865a653
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
4 deletions
+14
-4
modules/access/mms/mmstu.c
modules/access/mms/mmstu.c
+5
-0
src/input/stream.c
src/input/stream.c
+9
-4
No files found.
modules/access/mms/mmstu.c
View file @
fc9f8518
...
@@ -400,6 +400,11 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len )
...
@@ -400,6 +400,11 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len )
size_t
i_data
;
size_t
i_data
;
size_t
i_copy
;
size_t
i_copy
;
if
(
p_access
->
info
.
b_eof
)
{
return
0
;
}
i_data
=
0
;
i_data
=
0
;
/* *** now send data if needed *** */
/* *** now send data if needed *** */
...
...
src/input/stream.c
View file @
fc9f8518
...
@@ -1025,11 +1025,16 @@ static int AStreamReadStream( stream_t *s, void *p_read, int i_read )
...
@@ -1025,11 +1025,16 @@ static int AStreamReadStream( stream_t *s, void *p_read, int i_read )
/* seek within this stream if possible, else use plain old read and discard */
/* seek within this stream if possible, else use plain old read and discard */
stream_sys_t
*
p_sys
=
s
->
p_sys
;
stream_sys_t
*
p_sys
=
s
->
p_sys
;
access_t
*
p_access
=
p_sys
->
p_access
;
access_t
*
p_access
=
p_sys
->
p_access
;
/* seeking after EOF is not what we want */
if
(
!
(
p_access
->
info
.
b_eof
)
)
{
bool
b_aseek
;
bool
b_aseek
;
access_Control
(
p_access
,
ACCESS_CAN_SEEK
,
&
b_aseek
);
access_Control
(
p_access
,
ACCESS_CAN_SEEK
,
&
b_aseek
);
if
(
b_aseek
)
if
(
b_aseek
)
return
AStreamSeekStream
(
s
,
p_sys
->
i_pos
+
i_read
)
?
0
:
i_read
;
return
AStreamSeekStream
(
s
,
p_sys
->
i_pos
+
i_read
)
?
0
:
i_read
;
}
}
}
#ifdef STREAM_DEBUG
#ifdef STREAM_DEBUG
msg_Dbg
(
s
,
"AStreamReadStream: %d pos=%"
PRId64
" tk=%d start=%"
PRId64
msg_Dbg
(
s
,
"AStreamReadStream: %d pos=%"
PRId64
" tk=%d start=%"
PRId64
...
...
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