mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 08:21:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

nhttpd: ywebserver.cpp - fix possible segfault (svenhoefer)

Browse Source
This commit is contained in:
Jacek Jendrzej
2015-01-05 12:52:52 +01:00
parent 0e7f5714cc
commit 558f372dae
1 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/nhttpd/yhttpd_core/ywebserver.cpp
View File

@@ -413,6 +413,10 @@ bool CWebserver::handle_connection(CySocket *newSock) {
// create arguments // create arguments
TWebserverConnectionArgs *newConn = new TWebserverConnectionArgs; TWebserverConnectionArgs *newConn = new TWebserverConnectionArgs;
if (!newConn) {
dperror("CWebserver TWebserverConnectionArgs error!\n");
return false;
}
newConn->ySock = newSock; newConn->ySock = newSock;
newConn->ySock->handling = true; newConn->ySock->handling = true;
newConn->WebserverBackref = this; newConn->WebserverBackref = this;
@@ -457,24 +461,29 @@ bool CWebserver::handle_connection(CySocket *newSock) {
// Webserver-Thread for each connection // Webserver-Thread for each connection
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
void *WebThread(void *args) { void *WebThread(void *args) {
CWebserverConnection *con;
CWebserver *ws;
TWebserverConnectionArgs *newConn = (TWebserverConnectionArgs *) args; TWebserverConnectionArgs *newConn = (TWebserverConnectionArgs *) args;
ws = newConn->WebserverBackref; if (!newConn) {
dperror("WebThread called without arguments!\n");
return NULL;
}
bool is_threaded = newConn->is_treaded; bool is_threaded = newConn->is_treaded;
if (is_threaded) if (is_threaded)
log_level_printf(1, "++ Thread 0x06%X gestartet\n", log_level_printf(1, "++ Thread 0x06%X gestartet\n", (int) pthread_self());
(int) pthread_self());
if (!newConn) {
dperror("WebThread called without arguments!\n");
if (newConn->is_treaded)
pthread_exit( NULL);
}
// (1) create & init Connection // (1) create & init Connection
con = new CWebserverConnection(ws); CWebserver *ws = newConn->WebserverBackref;
if (!ws) {
dperror("WebThread CWebserver error!\n");
return NULL;
}
CWebserverConnection *con = new CWebserverConnection(ws);
if (!con) {
dperror("WebThread CWebserverConnection error!\n");
return NULL;
}
con->Request.UrlData["clientaddr"] = newConn->ySock->get_client_ip(); // TODO:here? con->Request.UrlData["clientaddr"] = newConn->ySock->get_client_ip(); // TODO:here?
con->sock = newConn->ySock; // give socket reference con->sock = newConn->ySock; // give socket reference
newConn->ySock->handling = true; // dont handle this socket now be webserver main loop newConn->ySock->handling = true; // dont handle this socket now be webserver main loop
@@ -485,9 +494,9 @@ void *WebThread(void *args) {
// (3) end connection handling // (3) end connection handling
#ifdef Y_CONFIG_FEATURE_KEEP_ALIVE #ifdef Y_CONFIG_FEATURE_KEEP_ALIVE
if(!con->keep_alive) if(!con->keep_alive)
log_level_printf(2,"FD SHOULD CLOSE sock:%d!!!\n",con->sock->get_socket()); log_level_printf(2,"FD SHOULD CLOSE sock:%d!!!\n",con->sock->get_socket());
else else
ws->addSocketToMasterSet(con->sock->get_socket()); // add to master set ws->addSocketToMasterSet(con->sock->get_socket()); // add to master set
#else #else
delete newConn->ySock; delete newConn->ySock;
#endif #endif