1berry/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUILD: htx: use the unchecked version of htx_get_head_blk() where needed

Browse Source 
stream.c and mux_fcgi.c may cause a warning for a possible NULL deref
at -Os, while that is not possible thanks to the previous test. Let's
just switch to __htx_get_head_blk() instead.
This commit is contained in:
Willy Tarreau 2022-05-30 16:27:48 +02:00
parent 771483da3e
commit d46b5b94f0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mux_fcgi.c
View File

@ -462,7 +462,7 @@ static void fcgi_trace(enum trace_level level, uint64_t mask, const struct trace
/* Display status-line if possible (verbosity > MINIMAL) */ /* Display status-line if possible (verbosity > MINIMAL) */
if (src->verbosity > FCGI_VERB_MINIMAL && htx && htx_nbblks(htx)) { if (src->verbosity > FCGI_VERB_MINIMAL && htx && htx_nbblks(htx)) {
const struct htx_blk *blk = htx_get_head_blk(htx); const struct htx_blk *blk = __htx_get_head_blk(htx);
const struct htx_sl *sl = htx_get_blk_ptr(htx, blk); const struct htx_sl *sl = htx_get_blk_ptr(htx, blk);
enum htx_blk_type type = htx_get_blk_type(blk); enum htx_blk_type type = htx_get_blk_type(blk);

2
src/stream.c
View File

@ -187,7 +187,7 @@ static void strm_trace(enum trace_level level, uint64_t mask, const struct trace
/* If msg defined, display status-line if possible (verbosity > MINIMAL) */ /* If msg defined, display status-line if possible (verbosity > MINIMAL) */
if (src->verbosity > STRM_VERB_MINIMAL && htx && htx_nbblks(htx)) { if (src->verbosity > STRM_VERB_MINIMAL && htx && htx_nbblks(htx)) {
const struct htx_blk *blk = htx_get_head_blk(htx); const struct htx_blk *blk = __htx_get_head_blk(htx);
const struct htx_sl *sl = htx_get_blk_ptr(htx, blk); const struct htx_sl *sl = htx_get_blk_ptr(htx, blk);
enum htx_blk_type type = htx_get_blk_type(blk); enum htx_blk_type type = htx_get_blk_type(blk);