OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0f02ea0
)
avformat/network: check ff_socket_nonblock() return and print a debug message
author
Michael Niedermayer
<michaelni@gmx.at>
Mon, 21 Oct 2013 15:23:35 +0000
(17:23 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Fri, 13 Dec 2013 16:08:03 +0000
(17:08 +0100)
Fixes CID1026744
Fixes CID1026743
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/network.c
patch
|
blob
|
history
diff --git
a/libavformat/network.c
b/libavformat/network.c
index
2ba435d
..
5e2bcf8
100644
(file)
--- a/
libavformat/network.c
+++ b/
libavformat/network.c
@@
-281,7
+281,9
@@
int ff_listen_bind(int fd, const struct sockaddr *addr,
closesocket(fd);
- ff_socket_nonblock(ret, 1);
+ if (ff_socket_nonblock(ret, 1) < 0)
+ av_log(NULL, AV_LOG_DEBUG, "ff_socket_nonblock failed\n");
+
return ret;
}
@@
-293,7
+295,8
@@
int ff_listen_connect(int fd, const struct sockaddr *addr,
int ret;
socklen_t optlen;
- ff_socket_nonblock(fd, 1);
+ if (ff_socket_nonblock(fd, 1) < 0)
+ av_log(NULL, AV_LOG_DEBUG, "ff_socket_nonblock failed\n");
while ((ret = connect(fd, addr, addrlen))) {
ret = ff_neterrno();