mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-10-05 22:29:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

core: fix lwip_itoa()

Browse Source 
See discussion in bug #51729

Signed-off-by: goldsimon <goldsimon@gmx.de>
This commit is contained in:
David Girault 2018-01-08 21:37:31 +01:00 committed by goldsimon
parent d7566216c9
commit 8801cbdb30
1 changed files with 24 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/core/def.c
View File

@ -199,11 +199,8 @@ void
lwip_itoa(char *result, size_t bufsize, int number) lwip_itoa(char *result, size_t bufsize, int number)
{ {
char *res = result; char *res = result;
char *tmp = result; char *tmp = result + bufsize - 1;
size_t res_left = bufsize; int n = (number >= 0) ? number : -number;
size_t result_len;
int pos = number >= 0;
int n = pos ? number : -number;
/* handle invalid bufsize */ /* handle invalid bufsize */
if (bufsize < 2) { if (bufsize < 2) {
@ -213,33 +210,31 @@ lwip_itoa(char *result, size_t bufsize, int number)
return; return;
} }
/* ensure output string is zero terminated */ /* First, add sign */
result[bufsize - 1] = 0; if (number < 0) {
result_len = 1; *res++ = '-';
/* create the string in a temporary buffer since we don't know how long
it will get */
tmp = &result[bufsize - 2];
do {
char val = (char)('0' + (n % 10));
*tmp = val;
tmp--;
n = n / 10;
result_len++;
} while ((n != 0) && (result_len <= bufsize));
/* output sign first */
if (!pos) {
*res = '-';
res++;
res_left--;
} }
if (result_len > res_left) { /* Then create the string from the end and stop if buffer full,
and ensure output string is zero terminated */
*tmp = 0;
while ((n != 0) && (tmp > res)) {
char val = (char)('0' + (n % 10));
tmp--;
*tmp = val;
n = n / 10;
}
if (n) {
/* buffer is too small */ /* buffer is too small */
result[0] = '.'; *result = 0;
result[1] = 0;
return; return;
} }
/* copy from temporary buffer to output buffer */ if (*tmp == 0) {
memmove(res, tmp + 1, result_len); /* Nothing added? */
*res++ = '0';
*res++ = 0;
return;
}
/* move from temporary buffer to output buffer (sign is not moved) */
memmove(res, tmp, (result + bufsize) - tmp);
} }
#endif #endif