RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-06 12:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MINOR: chunk: Fix function chunk_strcmp and chunk_strcasecmp match a substring.

Browse Source 
They could match different strings as equal if the chunk was shorter
than the string. Those functions are currently only used for SSL's
certificate DN entry extract.
This commit is contained in:
Emeric Brun 2014-05-09 17:11:07 +02:00 committed by Willy Tarreau
parent afb768340c
commit 78bd4038d7
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/chunk.c
View File

@ -207,8 +207,10 @@ int chunk_strcmp(const struct chunk *chk, const char *str)
int diff = 0;
do {
if (--len < 0)
if (--len < 0) {
diff = (unsigned char)0 - (unsigned char)*str;
break;
}
diff = (unsigned char)*(s1++) - (unsigned char)*(str++);
} while (!diff);
return diff;
@ -225,8 +227,10 @@ int chunk_strcasecmp(const struct chunk *chk, const char *str)
int diff = 0;
do {
if (--len < 0)
if (--len < 0) {
diff = (unsigned char)0 - (unsigned char)*str;
break;
}
diff = (unsigned char)*s1 - (unsigned char)*str;
if (unlikely(diff)) {
unsigned int l = (unsigned char)*s1;