Skip to content

W
wine-cw
Commit 99f5a055 authored by Mike McCormack's avatar Mike McCormack Committed by Alexandre Julliard
Browse files
Options

Fix logic problems with NETCON_connected.

parent 4acad25f
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 4 deletions
dlls/wininet/netconnection.c
View file @ 99f5a055
...@@ -224,7 +224,7 @@ BOOL NETCON_create(WININET_NETCONNECTION *connection, int domain, ...@@ -224,7 +224,7 @@ BOOL NETCON_create(WININET_NETCONNECTION *connection, int domain,
*/ */
BOOL NETCON_close(WININET_NETCONNECTION *connection) BOOL NETCON_close(WININET_NETCONNECTION *connection)
{ {
if (!NETCON_connected) return FALSE; if (!NETCON_connected(connection)) return FALSE;
if (!connection->useSSL) if (!connection->useSSL)
{ {
int result; int result;
...@@ -255,13 +255,17 @@ BOOL NETCON_close(WININET_NETCONNECTION *connection) ...@@ -255,13 +255,17 @@ BOOL NETCON_close(WININET_NETCONNECTION *connection)
BOOL NETCON_connect(WININET_NETCONNECTION *connection, const struct sockaddr *serv_addr, BOOL NETCON_connect(WININET_NETCONNECTION *connection, const struct sockaddr *serv_addr,
socklen_t addrlen) socklen_t addrlen)
{ {
if (!NETCON_connected) return FALSE; if (!NETCON_connected(connection)) return FALSE;
if (!connection->useSSL) if (!connection->useSSL)
{ {
int result; int result;
result = connect(connection->socketFD, serv_addr, addrlen); result = connect(connection->socketFD, serv_addr, addrlen);
if (result == -1) if (result == -1)
{
close(connection->socketFD);
connection->socketFD = -1;
return FALSE; return FALSE;
}
return TRUE; return TRUE;
} }
else else
...@@ -297,7 +301,7 @@ BOOL NETCON_connect(WININET_NETCONNECTION *connection, const struct sockaddr *se ...@@ -297,7 +301,7 @@ BOOL NETCON_connect(WININET_NETCONNECTION *connection, const struct sockaddr *se
BOOL NETCON_send(WININET_NETCONNECTION *connection, const void *msg, size_t len, int flags, BOOL NETCON_send(WININET_NETCONNECTION *connection, const void *msg, size_t len, int flags,
int *sent /* out */) int *sent /* out */)
{ {
if (!NETCON_connected) return FALSE; if (!NETCON_connected(connection)) return FALSE;
if (!connection->useSSL) if (!connection->useSSL)
{ {
*sent = send(connection->socketFD, msg, len, flags); *sent = send(connection->socketFD, msg, len, flags);
...@@ -328,7 +332,7 @@ BOOL NETCON_send(WININET_NETCONNECTION *connection, const void *msg, size_t len, ...@@ -328,7 +332,7 @@ BOOL NETCON_send(WININET_NETCONNECTION *connection, const void *msg, size_t len,
BOOL NETCON_recv(WININET_NETCONNECTION *connection, void *buf, size_t len, int flags, BOOL NETCON_recv(WININET_NETCONNECTION *connection, void *buf, size_t len, int flags,
int *recvd /* out */) int *recvd /* out */)
{ {
if (!NETCON_connected) return FALSE; if (!NETCON_connected(connection)) return FALSE;
if (!connection->useSSL) if (!connection->useSSL)
{ {
*recvd = recv(connection->socketFD, buf, len, flags); *recvd = recv(connection->socketFD, buf, len, flags);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment