mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-06 15:17:01 +02:00
Code Issues Projects Releases Wiki Activity

[MAJOR] fixed missing checks for NULL srv pointers (possible in dispatch mode)

Browse Source
This commit is contained in:
willy tarreau 2006-05-01 15:26:35 +02:00
parent cd655351b8
commit 926a3575e6
1 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
haproxy.c
View File

@ -2242,7 +2242,8 @@ int connect_server(struct session *s) {
#endif #endif
fd_insert(fd); fd_insert(fd);
s->srv->cur_sess++; if (s->srv)
s->srv->cur_sess++;
if (s->proxy->contimeout) if (s->proxy->contimeout)
tv_delayfrom(&s->cnexpire, &now, s->proxy->contimeout); tv_delayfrom(&s->cnexpire, &now, s->proxy->contimeout);
@ -4396,7 +4397,8 @@ int process_srv(struct session *t) {
/* timeout, connect error or first write error */ /* timeout, connect error or first write error */
//FD_CLR(t->srv_fd, StaticWriteEvent); //FD_CLR(t->srv_fd, StaticWriteEvent);
fd_delete(t->srv_fd); fd_delete(t->srv_fd);
t->srv->cur_sess--; if (t->srv)
t->srv->cur_sess--;
//close(t->srv_fd); //close(t->srv_fd);
t->conn_retries--; t->conn_retries--;
if (t->conn_retries >= 0) { if (t->conn_retries >= 0) {
@ -4506,7 +4508,8 @@ int process_srv(struct session *t) {
tv_eternity(&t->srexpire); tv_eternity(&t->srexpire);
tv_eternity(&t->swexpire); tv_eternity(&t->swexpire);
fd_delete(t->srv_fd); fd_delete(t->srv_fd);
t->srv->cur_sess--; if (t->srv)
t->srv->cur_sess--;
t->srv_state = SV_STCLOSE; t->srv_state = SV_STCLOSE;
t->logs.status = 502; t->logs.status = 502;
client_return(t, t->proxy->errmsg.len502, t->proxy->errmsg.msg502); client_return(t, t->proxy->errmsg.len502, t->proxy->errmsg.msg502);
@ -4528,7 +4531,8 @@ int process_srv(struct session *t) {
tv_eternity(&t->srexpire); tv_eternity(&t->srexpire);
tv_eternity(&t->swexpire); tv_eternity(&t->swexpire);
fd_delete(t->srv_fd); fd_delete(t->srv_fd);
t->srv->cur_sess--; if (t->srv)
t->srv->cur_sess--;
t->srv_state = SV_STCLOSE; t->srv_state = SV_STCLOSE;
t->logs.status = 502; t->logs.status = 502;
client_return(t, t->proxy->errmsg.len502, t->proxy->errmsg.msg502); client_return(t, t->proxy->errmsg.len502, t->proxy->errmsg.msg502);
@ -4961,7 +4965,8 @@ int process_srv(struct session *t) {
tv_eternity(&t->srexpire); tv_eternity(&t->srexpire);
tv_eternity(&t->swexpire); tv_eternity(&t->swexpire);
fd_delete(t->srv_fd); fd_delete(t->srv_fd);
t->srv->cur_sess--; if (t->srv)
t->srv->cur_sess--;
t->srv_state = SV_STCLOSE; t->srv_state = SV_STCLOSE;
t->logs.status = 502; t->logs.status = 502;
client_return(t, t->proxy->errmsg.len502, t->proxy->errmsg.msg502); client_return(t, t->proxy->errmsg.len502, t->proxy->errmsg.msg502);
@ -4990,7 +4995,8 @@ int process_srv(struct session *t) {
tv_eternity(&t->srexpire); tv_eternity(&t->srexpire);
tv_eternity(&t->swexpire); tv_eternity(&t->swexpire);
fd_delete(t->srv_fd); fd_delete(t->srv_fd);
t->srv->cur_sess--; if (t->srv)
t->srv->cur_sess--;
t->srv_state = SV_STCLOSE; t->srv_state = SV_STCLOSE;
t->logs.status = 504; t->logs.status = 504;
client_return(t, t->proxy->errmsg.len504, t->proxy->errmsg.msg504); client_return(t, t->proxy->errmsg.len504, t->proxy->errmsg.msg504);
@ -5086,7 +5092,8 @@ int process_srv(struct session *t) {
tv_eternity(&t->srexpire); tv_eternity(&t->srexpire);
tv_eternity(&t->swexpire); tv_eternity(&t->swexpire);
fd_delete(t->srv_fd); fd_delete(t->srv_fd);
t->srv->cur_sess--; if (t->srv)
t->srv->cur_sess--;
t->srv_state = SV_STCLOSE; t->srv_state = SV_STCLOSE;
if (!(t->flags & SN_ERR_MASK)) if (!(t->flags & SN_ERR_MASK))
t->flags |= SN_ERR_SRVCL; t->flags |= SN_ERR_SRVCL;
@ -5193,7 +5200,8 @@ int process_srv(struct session *t) {
//FD_CLR(t->srv_fd, StaticWriteEvent); //FD_CLR(t->srv_fd, StaticWriteEvent);
tv_eternity(&t->swexpire); tv_eternity(&t->swexpire);
fd_delete(t->srv_fd); fd_delete(t->srv_fd);
t->srv->cur_sess--; if (t->srv)
t->srv->cur_sess--;
//close(t->srv_fd); //close(t->srv_fd);
t->srv_state = SV_STCLOSE; t->srv_state = SV_STCLOSE;
if (!(t->flags & SN_ERR_MASK)) if (!(t->flags & SN_ERR_MASK))
@ -5207,7 +5215,8 @@ int process_srv(struct session *t) {
//FD_CLR(t->srv_fd, StaticWriteEvent); //FD_CLR(t->srv_fd, StaticWriteEvent);
tv_eternity(&t->swexpire); tv_eternity(&t->swexpire);
fd_delete(t->srv_fd); fd_delete(t->srv_fd);
t->srv->cur_sess--; if (t->srv)
t->srv->cur_sess--;
//close(t->srv_fd); //close(t->srv_fd);
t->srv_state = SV_STCLOSE; t->srv_state = SV_STCLOSE;
/* TODO : check if there are pending connections on this server */ /* TODO : check if there are pending connections on this server */
@ -5217,7 +5226,8 @@ int process_srv(struct session *t) {
//FD_CLR(t->srv_fd, StaticWriteEvent); //FD_CLR(t->srv_fd, StaticWriteEvent);
tv_eternity(&t->swexpire); tv_eternity(&t->swexpire);
fd_delete(t->srv_fd); fd_delete(t->srv_fd);
t->srv->cur_sess--; if (t->srv)
t->srv->cur_sess--;
//close(t->srv_fd); //close(t->srv_fd);
t->srv_state = SV_STCLOSE; t->srv_state = SV_STCLOSE;
if (!(t->flags & SN_ERR_MASK)) if (!(t->flags & SN_ERR_MASK))
@ -5253,7 +5263,8 @@ int process_srv(struct session *t) {
//FD_CLR(t->srv_fd, StaticReadEvent); //FD_CLR(t->srv_fd, StaticReadEvent);
tv_eternity(&t->srexpire); tv_eternity(&t->srexpire);
fd_delete(t->srv_fd); fd_delete(t->srv_fd);
t->srv->cur_sess--; if (t->srv)
t->srv->cur_sess--;
//close(t->srv_fd); //close(t->srv_fd);
t->srv_state = SV_STCLOSE; t->srv_state = SV_STCLOSE;
if (!(t->flags & SN_ERR_MASK)) if (!(t->flags & SN_ERR_MASK))
@ -5267,7 +5278,8 @@ int process_srv(struct session *t) {
//FD_CLR(t->srv_fd, StaticReadEvent); //FD_CLR(t->srv_fd, StaticReadEvent);
tv_eternity(&t->srexpire); tv_eternity(&t->srexpire);
fd_delete(t->srv_fd); fd_delete(t->srv_fd);
t->srv->cur_sess--; if (t->srv)
t->srv->cur_sess--;
//close(t->srv_fd); //close(t->srv_fd);
t->srv_state = SV_STCLOSE; t->srv_state = SV_STCLOSE;
/* TODO : check if there are pending connections on this server */ /* TODO : check if there are pending connections on this server */
@ -5277,7 +5289,8 @@ int process_srv(struct session *t) {
//FD_CLR(t->srv_fd, StaticReadEvent); //FD_CLR(t->srv_fd, StaticReadEvent);
tv_eternity(&t->srexpire); tv_eternity(&t->srexpire);
fd_delete(t->srv_fd); fd_delete(t->srv_fd);
t->srv->cur_sess--; if (t->srv)
t->srv->cur_sess--;
//close(t->srv_fd); //close(t->srv_fd);
t->srv_state = SV_STCLOSE; t->srv_state = SV_STCLOSE;
if (!(t->flags & SN_ERR_MASK)) if (!(t->flags & SN_ERR_MASK))