RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-12 08:27:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

[BUG] fix error checking in strl2ic/strl2uic()

Browse Source 
The strl2ic() and strl2uic() primitives used to convert string to
integers could return 10 times the value read if they stopped on
non-digit because of a mis-placed loop exit.
This commit is contained in:
Willy Tarreau 2007-10-25 09:42:24 +02:00
parent 85130941e7
commit 3f0c976135
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/common/standard.h
View File

@ -152,14 +152,14 @@ static inline unsigned int __strl2ui(const char *s, int len)
static inline unsigned int __strl2uic(const char *s, int len)
{
unsigned int i = 0;
unsigned int j;
unsigned int j, k;
while (len-- > 0) {
j = (*s++) - '0';
i = i * 10;
k = i * 10;
if (j > 9)
break;
i += j;
i = k + j;
}
return i;
}

10
src/standard.c
View File

@ -248,27 +248,27 @@ unsigned int strl2uic(const char *s, int len)
int strl2ic(const char *s, int len)
{
int i = 0;
int j;
int j, k;
if (len > 0) {
if (*s != '-') {
/* positive number */
while (len-- > 0) {
j = (*s++) - '0';
i = i * 10;
k = i * 10;
if (j > 9)
break;
i += j;
i = k + j;
}
} else {
/* negative number */
s++;
while (--len > 0) {
j = (*s++) - '0';
i = i * 10;
k = i * 10;
if (j > 9)
break;
i -= j;
i = k - j;
}
}
}