Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
607b5458
Commit
607b5458
authored
Dec 21, 2007
by
Rémi Denis-Courmont
Browse files
- Fix error handling
- Fix a warning
parent
2004f95f
Changes
1
Hide whitespace changes
Inline
Side-by-side
modules/access/udp.c
View file @
607b5458
...
...
@@ -326,16 +326,17 @@ static block_t *BlockUDP( access_t *p_access )
{
access_sys_t
*
p_sys
=
p_access
->
p_sys
;
block_t
*
p_block
;
ssize_t
len
;
if
(
p_access
->
info
.
b_eof
)
return
NULL
;
/* Read data */
p_block
=
block_New
(
p_access
,
MTU
);
p_block
->
i_buffer
=
net_Read
(
p_access
,
p_sys
->
fd
,
NULL
,
p_block
->
p_buffer
,
MTU
,
VLC_FALSE
);
if
(
(
p_block
->
i_buffer
<
0
)
||
(
p_sys
->
b_comedia
&&
(
p_block
->
i_buffer
==
0
)
)
)
len
=
net_Read
(
p_access
,
p_sys
->
fd
,
NULL
,
p_block
->
p_buffer
,
MTU
,
VLC_FALSE
);
if
(
(
len
<
0
)
||
(
p_sys
->
b_comedia
&&
(
len
==
0
)
)
)
{
if
(
p_sys
->
b_comedia
)
{
...
...
@@ -346,7 +347,7 @@ static block_t *BlockUDP( access_t *p_access )
return
NULL
;
}
return
block_Realloc
(
p_block
,
0
,
p_block
->
i_buffer
);
return
block_Realloc
(
p_block
,
0
,
p_block
->
i_buffer
=
len
);
}
/*****************************************************************************
...
...
@@ -395,7 +396,7 @@ static block_t *BlockTCP( access_t *p_access )
p_block
->
i_buffer
+=
i_read
;
}
if
(
p_block
->
i_buffer
<
(
2
+
framelen
)
)
if
(
p_block
->
i_buffer
<
(
2
u
+
framelen
)
)
return
NULL
;
// incomplete frame
/* Hide framing from RTP layer */
...
...
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