mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-21 22:01:31 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: sample: remove impossible tests on negative smp->data.u.str.data

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 remove
negative size checks.
This commit is contained in:
Willy Tarreau 2018-08-22 05:07:14 +02:00
parent bba81563cf
commit b509232eb8
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/proto/sample.h
View File

@ -92,8 +92,7 @@ int smp_is_safe(struct sample *smp)
/* Fall through */
case SMP_T_STR:
if ((smp->data.u.str.data < 0) ||
(smp->data.u.str.size && smp->data.u.str.data >= smp->data.u.str.size))
if (smp->data.u.str.size && smp->data.u.str.data >= smp->data.u.str.size)
return 0;
if (smp->data.u.str.area[smp->data.u.str.data] == 0)
@ -106,8 +105,7 @@ int smp_is_safe(struct sample *smp)
return 1;
case SMP_T_BIN:
return (smp->data.u.str.data >= 0) &&
(!smp->data.u.str.size || smp->data.u.str.data <= smp->data.u.str.size);
return !smp->data.u.str.size || smp->data.u.str.data <= smp->data.u.str.size;
default:
return 1;
@ -145,7 +143,6 @@ int smp_is_rw(struct sample *smp)
case SMP_T_STR:
if (!smp->data.u.str.size ||
smp->data.u.str.data < 0 ||
smp->data.u.str.data >= smp->data.u.str.size)
return 0;
@ -155,7 +152,6 @@ int smp_is_rw(struct sample *smp)
case SMP_T_BIN:
return smp->data.u.str.size &&
smp->data.u.str.data >= 0 &&
smp->data.u.str.data <= smp->data.u.str.size;
default: