github/amiga-clib2
1
0
Fork 0
mirror of https://github.com/adtools/clib2.git synced 2025-12-08 14:59:05 +00:00
Code Issues Releases Wiki Activity

- Fixed the locking and the NULL pointer reference.

Browse Source 
git-svn-id: file:///Users/olsen/Code/migration-svn-zu-git/logical-line-staging/clib2/trunk@15034 87f5fb63-7c3d-0410-a384-fd976d0f7a62
This commit is contained in:
Olaf Barthel
2005-10-09 09:05:27 +00:00
parent 4e30f5604d
commit 159e55f1e6
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
library/socket_accept.c
View File

@ -1,5 +1,5 @@
/* /*
* $Id: socket_accept.c,v 1.13 2005-10-08 15:59:56 obarthel Exp $ * $Id: socket_accept.c,v 1.14 2005-10-09 09:05:27 obarthel Exp $
* *
* :ts=4 * :ts=4
* *
@ -57,7 +57,6 @@ accept(int sockfd,struct sockaddr *cliaddr,socklen_t *addrlen)
int result = ERROR; int result = ERROR;
LONG new_socket_fd = -1; LONG new_socket_fd = -1;
BOOL stdio_locked = FALSE; BOOL stdio_locked = FALSE;
BOOL fd_locked = FALSE;
ENTER(); ENTER();
@ -85,6 +84,22 @@ accept(int sockfd,struct sockaddr *cliaddr,socklen_t *addrlen)
assert( FLAG_IS_SET(__fd[sockfd]->fd_Flags,FDF_IN_USE) ); assert( FLAG_IS_SET(__fd[sockfd]->fd_Flags,FDF_IN_USE) );
assert( FLAG_IS_SET(__fd[sockfd]->fd_Flags,FDF_IS_SOCKET) ); assert( FLAG_IS_SET(__fd[sockfd]->fd_Flags,FDF_IS_SOCKET) );
/* We need to know which parameter to submit to the accept()
call first. */
__stdio_lock();
stdio_locked = TRUE;
fd = __get_file_descriptor_socket(sockfd);
if(fd == NULL)
goto out;
/* Now let go of the stdio lock, so that the only locking performed
will be done inside the accept() call. Note that this makes the
accept() stub vulnerable: a different Process might be able to
close the socket accept() will wait upon! */
__stdio_unlock();
stdio_locked = FALSE;
/* Wait for the accept() to complete, then hook up the socket /* Wait for the accept() to complete, then hook up the socket
with a file descriptor. */ with a file descriptor. */
PROFILE_OFF(); PROFILE_OFF();
@ -97,16 +112,11 @@ accept(int sockfd,struct sockaddr *cliaddr,socklen_t *addrlen)
goto out; goto out;
} }
/* OK, back to work: we'll need to manipulate the file
descriptor tables. */
__stdio_lock(); __stdio_lock();
stdio_locked = TRUE; stdio_locked = TRUE;
fd = __get_file_descriptor_socket(sockfd);
if(fd == NULL)
goto out;
__fd_lock(fd);
fd_locked = TRUE;
new_fd_slot_number = __find_vacant_fd_entry(); new_fd_slot_number = __find_vacant_fd_entry();
if(new_fd_slot_number < 0) if(new_fd_slot_number < 0)
{ {
@ -152,9 +162,6 @@ accept(int sockfd,struct sockaddr *cliaddr,socklen_t *addrlen)
PROFILE_ON(); PROFILE_ON();
} }
if(fd_locked)
__fd_unlock(fd);
if(stdio_locked) if(stdio_locked)
__stdio_unlock(); __stdio_unlock();