github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-09-23 17:58:30 +00:00
Code Issues Projects Releases Wiki Activity

hv: remove the theoretic infinite loop

Browse Source 
There may the theoretic infinite loop with some code. But actually it doesn't.
This patch make these code more obvious it's not a potentially infinite loop.

Tracked-On: #861
Signed-off-by: Li, Fei1 <fei1.li@intel.com>
This commit is contained in:
Li, Fei1
2018-11-30 16:31:16 +08:00
committed by wenlingz
parent 5d19962d73
commit 7a62154e36
6 changed files with 32 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
hypervisor/lib/string.c
View File

@@ -14,6 +14,21 @@ static inline bool is_space(char c)
return ((c == ' ') || (c == '\t'));
}
static inline char hex_digit_value (char ch)
{
char c;
if ('0' <= ch && ch <= '9') {
c = ch - '0';
} else if ('a' <= ch && ch <= 'f') {
c = ch - 'a' + 10;
} else if ('A' <= ch && ch <= 'F') {
c = ch - 'A' + 10;
} else {
c = -1;
}
return c;
}
/*
* Convert a string to a long integer - decimal support only.
*/
@@ -99,7 +114,7 @@ long strtol_deci(const char *nptr)
uint64_t strtoul_hex(const char *nptr)
{
const char *s = nptr;
char c;
char c, digit;
uint64_t acc, cutoff, cutlim;
uint64_t base = 16UL;
int any;
@@ -121,29 +136,20 @@ uint64_t strtoul_hex(const char *nptr)
cutlim = ULONG_MAX % base;
acc = 0UL;
any = 0;
do {
if ((c >= '0') && (c <= '9')) {
c -= '0';
} else if ((c >= 'A') && (c <= 'F')) {
c -= 'A' - 10;
} else if ((c >= 'a') && (c <= 'f')) {
c -= 'a' - 10;
} else {
break;
}
if ((acc > cutoff) ||
((acc == cutoff) && ((uint64_t)c > cutlim))) {
digit = hex_digit_value(c);
while (digit >= 0) {
if ((acc > cutoff) || ((acc == cutoff) && ((uint64_t)digit > cutlim))) {
any = -1;
break;
} else {
acc *= base;
acc += c;
acc += digit;
}
c = *s;
s++;
} while (true);
digit = hex_digit_value(c);
}
if (any < 0) {
acc = ULONG_MAX;