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

BUG/MINOR: chunks: do not store -1 into chunk_printf() in case of error

Browse Source 
Since commit 843b7cb ("MEDIUM: chunks: make the chunk struct's fields
match the buffer struct") a chunk length is unsigned so we can't reliably
store -1 and check for negative values in the caller. Only one such
location was found in proto_http's http-request auth rules (which cannot
realistically fail).

No backport is needed.
This commit is contained in:
Willy Tarreau 2018-08-22 05:14:37 +02:00
parent 49725a0977
commit 5f6333caca
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/chunk.c
View File

@ -149,10 +149,9 @@ int chunk_printf(struct buffer *chk, const char *fmt, ...)
va_start(argp, fmt);
ret = vsnprintf(chk->area, chk->size, fmt, argp);
va_end(argp);
chk->data = ret;
if (ret >= chk->size)
ret = -1;
return -1;
chk->data = ret;
return chk->data;

3
src/proto_http.c
View File

@ -3845,8 +3845,7 @@ int http_process_request(struct stream *s, struct channel *req, int an_bit)
}
if (sess->fe->header_unique_id && s->unique_id) {
chunk_printf(&trash, "%s: %s", sess->fe->header_unique_id, s->unique_id);
if (trash.data < 0)
if (chunk_printf(&trash, "%s: %s", sess->fe->header_unique_id, s->unique_id) < 0)
goto return_bad_req;
if (unlikely(http_header_add_tail2(&txn->req, &txn->hdr_idx, trash.area, trash.data) < 0))
goto return_bad_req;