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

CLEANUP: chunk: remove misleading chunk_strncat() function

Browse Source 
This function claims to perform an strncat()-like operation but it does
not, it always copies the indicated number of bytes, regardless of the
presence of a NUL character (what is currently done by chunk_memcat()).
Let's remove it and explicitly replace it with chunk_memcat().
This commit is contained in:
Willy Tarreau 2021-11-08 11:44:47 +01:00
parent 8f1d178cd1
commit 49b0482ed4
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/haproxy/chunk.h
View File

@ -203,14 +203,6 @@ static inline int chunk_strcat(struct buffer *chk, const char *str)
return 1; return 1;
} }
/* appends <nb> characters from str after <chk>.
* Returns 0 in case of failure.
*/
static inline int chunk_strncat(struct buffer *chk, const char *str, int nb)
{
return chunk_memcat(chk, str, nb);
}
/* Adds a trailing zero to the current chunk and returns the pointer to the /* Adds a trailing zero to the current chunk and returns the pointer to the
* following part. The purpose is to be able to use a chunk as a series of * following part. The purpose is to be able to use a chunk as a series of
* short independent strings with chunk_* functions, which do not need to be * short independent strings with chunk_* functions, which do not need to be

8
src/cache.c
View File

@ -779,8 +779,8 @@ int http_calc_maxage(struct stream *s, struct cache *cache, int *true_maxage)
if (value) { if (value) {
struct buffer *chk = get_trash_chunk(); struct buffer *chk = get_trash_chunk();
chunk_strncat(chk, value, ctx.value.len - 8 + 1); chunk_memcat(chk, value, ctx.value.len - 8 + 1);
chunk_strncat(chk, "", 1); chunk_memcat(chk, "", 1);
offset = (*chk->area == '"') ? 1 : 0; offset = (*chk->area == '"') ? 1 : 0;
smaxage = strtol(chk->area + offset, &endptr, 10); smaxage = strtol(chk->area + offset, &endptr, 10);
if (unlikely(smaxage < 0 || endptr == chk->area)) if (unlikely(smaxage < 0 || endptr == chk->area))
@ -791,8 +791,8 @@ int http_calc_maxage(struct stream *s, struct cache *cache, int *true_maxage)
if (value) { if (value) {
struct buffer *chk = get_trash_chunk(); struct buffer *chk = get_trash_chunk();
chunk_strncat(chk, value, ctx.value.len - 7 + 1); chunk_memcat(chk, value, ctx.value.len - 7 + 1);
chunk_strncat(chk, "", 1); chunk_memcat(chk, "", 1);
offset = (*chk->area == '"') ? 1 : 0; offset = (*chk->area == '"') ? 1 : 0;
maxage = strtol(chk->area + offset, &endptr, 10); maxage = strtol(chk->area + offset, &endptr, 10);
if (unlikely(maxage < 0 || endptr == chk->area)) if (unlikely(maxage < 0 || endptr == chk->area))