sigmasternchen/CFloor
1
0
Fork 0
mirror of https://github.com/sigmasternchen/CFloor synced 2025-03-15 20:28:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixing empty response bug: don't close socket twice - fd might be reused

Browse source
This commit is contained in:
overflowerror 2021-04-29 16:07:31 +02:00
parent 92c4721f5b
commit 907f928c2f
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/networking.c
View file

@ -117,8 +117,10 @@ void cleanup() {
ssl_closeConnection(connection->sslConnection); ssl_closeConnection(connection->sslConnection);
#endif #endif
close(connection->readfd); if (connection->readfd >= 0)
close(connection->writefd); close(connection->readfd);
if (connection->writefd >= 0)
close(connection->writefd);
if (connection->metaData.path != NULL) if (connection->metaData.path != NULL)
free(connection->metaData.path); free(connection->metaData.path);
@ -243,6 +245,8 @@ void safeEndConnection(struct connection* connection, bool force) {
// close socket // close socket
close(connection->readfd); close(connection->readfd);
close(connection->writefd); close(connection->writefd);
connection->readfd = -1;
connection->writefd = -1;
pthread_mutex_lock(&(connection->lock)); pthread_mutex_lock(&(connection->lock));
connection->state = CLOSED; connection->state = CLOSED;
@ -289,7 +293,13 @@ int sendHeader(int statusCode, struct headers* headers, struct request* request)
fprintf(stream, "\r\n"); fprintf(stream, "\r\n");
fclose(stream); fclose(stream);
return fd; tmp = dup(fd);
if (tmp < 0) {
error("networking: sendHeader: dup: %s", strerror(errno));
return -1;
}
return tmp;
} }
/* /*
@ -338,6 +348,8 @@ void* requestThread(void* data) {
if (pthread_create(&(connection->threads.response), NULL, &responseThread, connection) < 0) { if (pthread_create(&(connection->threads.response), NULL, &responseThread, connection) < 0) {
close(connection->readfd); close(connection->readfd);
close(connection->writefd); close(connection->writefd);
connection->readfd = -1;
connection->writefd = -1;
error("networking: Couldn't start response thread."); error("networking: Couldn't start response thread.");
warn("networking: Aborting request."); warn("networking: Aborting request.");
@ -705,7 +717,7 @@ void* listenThread(void* _bind) {
connection->sslConnection = NULL; connection->sslConnection = NULL;
connection->readfd = tmp; connection->readfd = tmp;
connection->writefd = tmp; connection->writefd = dup(tmp);
setNonBlocking(tmp, true); setNonBlocking(tmp, true);
setSIGIO(tmp, true); setSIGIO(tmp, true);