RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-21 13:16:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUILD: debug: Avoid warnings in dev mode with -02 because of some BUG_ON tests

Browse Source 
Some BUG_ON() tests emit a warning because of a potential null pointer
dereference on an HTX block. In fact, it should never happen, but now, GCC is
happy.

This patch must be backported to 2.0.
This commit is contained in:
Christopher Faulet 2019-11-18 15:50:25 +01:00
parent eba2294e5b
commit ea009736d8
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hlua.c
View File

@ -3911,7 +3911,7 @@ static int hlua_applet_http_new(lua_State *L, struct appctx *ctx)
htx = htxbuf(&s->req.buf);
blk = htx_get_first_blk(htx);
BUG_ON(htx_get_blk_type(blk) != HTX_BLK_REQ_SL);
BUG_ON(!blk || htx_get_blk_type(blk) != HTX_BLK_REQ_SL);
sl = htx_get_blk_ptr(htx, blk);
/* Stores the request method. */

4
src/mux_h2.c
View File

@ -4629,7 +4629,7 @@ static size_t h2s_frt_make_resp_headers(struct h2s *h2s, struct htx *htx)
/* get the start line, we do have one */
blk = htx_get_head_blk(htx);
BUG_ON(htx_get_blk_type(blk) != HTX_BLK_RES_SL);
BUG_ON(!blk || htx_get_blk_type(blk) != HTX_BLK_RES_SL);
ALREADY_CHECKED(blk);
sl = htx_get_blk_ptr(htx, blk);
h2s->status = sl->info.res.status;
@ -4864,7 +4864,7 @@ static size_t h2s_bck_make_req_headers(struct h2s *h2s, struct htx *htx)
/* get the start line, we do have one */
blk = htx_get_head_blk(htx);
BUG_ON(htx_get_blk_type(blk) != HTX_BLK_REQ_SL);
BUG_ON(!blk || htx_get_blk_type(blk) != HTX_BLK_REQ_SL);
ALREADY_CHECKED(blk);
sl = htx_get_blk_ptr(htx, blk);
meth = htx_sl_req_meth(sl);

2
src/stats.c
View File

@ -284,7 +284,7 @@ static const char *stats_scope_ptr(struct appctx *appctx, struct stream_interfac
struct ist uri;
blk = htx_get_head_blk(htx);
BUG_ON(htx_get_blk_type(blk) != HTX_BLK_REQ_SL);
BUG_ON(!blk || htx_get_blk_type(blk) != HTX_BLK_REQ_SL);
ALREADY_CHECKED(blk);
uri = htx_sl_req_uri(htx_get_blk_ptr(htx, blk));
return uri.ptr + appctx->ctx.stats.scope_str;