diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2005-08-18 13:14:15 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2005-08-18 13:14:15 +0000 |
| commit | abebe87c40e8342525bdcac02bca975f042320bd (patch) | |
| tree | 4b400ddcc72e7c93edc6c2505cbefcebd9c2de2b | |
| parent | d71805725f122d647ce68576eb03db8308bcefa4 (diff) | |
| download | cygnal-abebe87c40e8342525bdcac02bca975f042320bd.tar.gz cygnal-abebe87c40e8342525bdcac02bca975f042320bd.tar.bz2 cygnal-abebe87c40e8342525bdcac02bca975f042320bd.zip | |
* fhandler_socket.cc (fhandler_socket::recvfrom): Always initialize
ret to 0.
(fhandler_socket::recvmsg): Ditto.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 6 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler_socket.cc | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 1e14b73a7..0e476582b 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,11 @@ 2005-08-18 Corinna Vinschen <corinna@vinschen.de> + * fhandler_socket.cc (fhandler_socket::recvfrom): Always initialize + ret to 0. + (fhandler_socket::recvmsg): Ditto. + +2005-08-18 Corinna Vinschen <corinna@vinschen.de> + * errno.cc (strerror): Check errnum for underflow. 2005-08-17 Christopher Faylor <cgf@timesys.com> diff --git a/winsup/cygwin/fhandler_socket.cc b/winsup/cygwin/fhandler_socket.cc index d2520e2bd..b5e5248ec 100644 --- a/winsup/cygwin/fhandler_socket.cc +++ b/winsup/cygwin/fhandler_socket.cc @@ -1004,7 +1004,7 @@ fhandler_socket::recvfrom (void *ptr, size_t len, int flags, struct sockaddr *from, int *fromlen) { int res = SOCKET_ERROR; - DWORD ret; + DWORD ret = 0; flags &= MSG_WINMASK; if (!winsock2_active) @@ -1016,7 +1016,7 @@ fhandler_socket::recvfrom (void *ptr, size_t len, int flags, WSABUF wsabuf = { len, (char *) ptr }; if (is_nonblocking () || closed () || async_io ()) - res = WSARecvFrom (get_socket (), &wsabuf, 1, (ret = 0, &ret), + res = WSARecvFrom (get_socket (), &wsabuf, 1, &ret, (DWORD *) &flags, from, fromlen, NULL, NULL); else { @@ -1136,10 +1136,10 @@ fhandler_socket::recvmsg (struct msghdr *msg, int flags, ssize_t tot) while (wsaptr != wsabuf); } - DWORD ret; + DWORD ret = 0; if (is_nonblocking () || closed () || async_io ()) - res = WSARecvFrom (get_socket (), wsabuf, iovcnt, (ret = 0, &ret), + res = WSARecvFrom (get_socket (), wsabuf, iovcnt, &ret, (DWORD *) &flags, from, fromlen, NULL, NULL); else { |