RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-01 01:32:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUILD: stconn: fix build warning at -O3 about possible null sc

Browse Source 
gcc-6.x and 7.x emit build warnings about sc possibly being null upon
return from sc_detach_endp(). This actually is not the case and the
compiler is a little bit overzealous there, but there exists code
paths that can make this analysis non-trivial so let's at least add
a similar BUG_ON() to let both the compiler and the deverloper know
this doesn't happen.

This should be backported to 2.6.
This commit is contained in:
Willy Tarreau 2022-08-11 13:56:42 +02:00
parent a8b2f843d2
commit 6a378d1677
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/stconn.c
View File

@ -459,6 +459,7 @@ int sc_reset_endp(struct stconn *sc)
/* The app is still attached, the sc will not be released */
sc_detach_endp(&sc);
BUG_ON(!sc);
BUG_ON(sc->sedesc);
sc->sedesc = new_sd;
sc->sedesc->sc = sc;
@ -1977,5 +1978,6 @@ void sc_conn_commit_endp_upgrade(struct stconn *sc)
return;
sc_detach_endp(&sc);
/* Because it was already set as detached, the sedesc must be preserved */
BUG_ON(!sc);
BUG_ON(!sc->sedesc);
}