RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 13:57:35 +00:00
Code Issues Activity Actions

LibC: Fix strtol() not populating `endptr' for valid strings

Browse source 
We were not writing anything out to the `endptr` pointer if a number
was successfully parsed from the input string.

Fixes #460.
This commit is contained in:
Andreas Kling 2019-08-17 22:07:48 +02:00
parent a20f3c6647
commit 266b9cb654
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Libraries/LibC/stdlib.cpp
View file

@ -352,7 +352,8 @@ long strtol(const char* str, char** endptr, int base)
} }
} }
} }
const char* estr = str + strlen(str) - 1; size_t length = strlen(str);
const char* estr = str + length - 1;
long track = 1; long track = 1;
long num = 0; long num = 0;
while (estr >= str) { while (estr >= str) {
@ -362,12 +363,14 @@ long strtol(const char* str, char** endptr, int base)
digit_value = 10 + (*estr - 'A'); digit_value = 10 + (*estr - 'A');
num += (track *= base) / base * digit_value; num += (track *= base) / base * digit_value;
} else { } else {
if (endptr != NULL) if (endptr)
*endptr = const_cast<char*>(estr); *endptr = const_cast<char*>(estr);
return 0; return 0;
}; };
estr--; estr--;
} }
if (endptr)
*endptr = const_cast<char*>(str + length);
return num * sign; return num * sign;
} }