RepoMirrors
/
haproxy
mirror of http://git.haproxy.org/git/haproxy.git/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MINOR: chunk: remove impossible tests on negative chunk->data 

Since commit 843b7cb ("MEDIUM: chunks: make the chunk struct's fields
match the buffer struct") a chunk length is unsigned so we can remove
negative size checks.
This commit is contained in:
Willy Tarreau 2018-08-22 04:59:48 +02:00
parent 1c913e4232
commit bba81563cf
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/common/chunk.h
View File

@ -117,7 +117,7 @@ static inline int chunk_memcpy(struct buffer *chk, const char *src,
static inline int chunk_memcat(struct buffer *chk, const char *src,
size_t len)
{
if (unlikely(chk->data < 0 || chk->data + len >= chk->size))
if (unlikely(chk->data + len >= chk->size))
return 0;
memcpy(chk->area + chk->data, src, len);
@ -152,7 +152,7 @@ static inline int chunk_strcat(struct buffer *chk, const char *str)
len = strlen(str);
if (unlikely(chk->data < 0 || chk->data + len >= chk->size))
if (unlikely(chk->data + len >= chk->size))
return 0;
memcpy(chk->area + chk->data, str, len + 1);
@ -165,7 +165,7 @@ static inline int chunk_strcat(struct buffer *chk, const char *str)
*/
static inline int chunk_strncat(struct buffer *chk, const char *str, int nb)
{
if (unlikely(chk->data < 0 || chk->data + nb >= chk->size))
if (unlikely(chk->data + nb >= chk->size))
return 0;
memcpy(chk->area + chk->data, str, nb);
@ -187,7 +187,7 @@ static inline int chunk_strncat(struct buffer *chk, const char *str, int nb)
*/
static inline char *chunk_newstr(struct buffer *chk)
{
if (chk->data < 0 || chk->data + 1 >= chk->size)
if (chk->data + 1 >= chk->size)
return NULL;
chk->area[chk->data++] = 0;
@ -219,7 +219,7 @@ static inline void chunk_destroy(struct buffer *chk)
*/
static inline char *chunk_dup(struct buffer *dst, const struct buffer *src)
{
if (!dst || !src || src->data < 0 || !src->area)
if (!dst || !src || !src->area)
return NULL;
if (dst->size)

8
src/chunk.c
View File

@ -167,7 +167,7 @@ int chunk_appendf(struct buffer *chk, const char *fmt, ...)
va_list argp;
int ret;
if (chk->data < 0 || !chk->area || !chk->size)
if (!chk->area || !chk->size)
return 0;
va_start(argp, fmt);
@ -193,9 +193,6 @@ int chunk_htmlencode(struct buffer *dst, struct buffer *src)
int olen, free;
char c;
if (dst->data < 0)
return dst->data;
olen = dst->data;
for (i = 0; i < src->data; i++) {
@ -238,9 +235,6 @@ int chunk_asciiencode(struct buffer *dst, struct buffer *src, char qc)
int olen, free;
char c;
if (dst->data < 0)
return dst->data;
olen = dst->data;
for (i = 0; i < src->data; i++) {