]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
[BUG] unix socket: don't try to dereference frontend/backends
authorWilly Tarreau <w@1wt.eu>
Wed, 14 Oct 2009 13:22:58 +0000 (15:22 +0200)
committerWilly Tarreau <w@1wt.eu>
Wed, 14 Oct 2009 13:25:37 +0000 (15:25 +0200)
John Lauro reported a new crash on 1.3.21 due to a dereferencing bug
of the frontend which does not have any frontend. The bug was introduced
by commit a3e0e0767f55474e676fffa3387dab4d022a0675.

src/proto_uxst.c

index f3540722aee91f21eab73bd6f4ddb7cf12066660..b4685d59676acdcd3d6d5f9756135e7a2af3091d 100644 (file)
@@ -466,8 +466,6 @@ int uxst_event_accept(int fd) {
                s->si[0].chk_snd = stream_sock_chk_snd;
                s->si[0].fd = cfd;
                s->si[0].flags = SI_FL_NONE;
-               if (s->fe->options2 & PR_O2_INDEPSTR)
-                       s->si[0].flags |= SI_FL_INDEP_STR;
                s->si[0].exp = TICK_ETERNITY;
 
                s->si[1].state = s->si[1].prev_state = SI_ST_INI;
@@ -481,8 +479,6 @@ int uxst_event_accept(int fd) {
                s->si[1].exp = TICK_ETERNITY;
                s->si[1].fd = -1; /* just to help with debugging */
                s->si[1].flags = SI_FL_NONE;
-               if (s->be->options2 & PR_O2_INDEPSTR)
-                       s->si[1].flags |= SI_FL_INDEP_STR;
 
                s->srv = s->prev_srv = s->srv_conn = NULL;
                s->pend_pos = NULL;