mirror of
https://github.com/owntone/owntone-server.git
synced 2025-01-27 06:33:21 -05:00
[misc] Set output of safe_xxx to 0 also in error cases (for safety)
This commit is contained in:
parent
ab06a9fd7d
commit
c975cf4474
12
src/misc.c
12
src/misc.c
@ -48,6 +48,8 @@ safe_atoi32(const char *str, int32_t *val)
|
|||||||
char *end;
|
char *end;
|
||||||
long intval;
|
long intval;
|
||||||
|
|
||||||
|
*val = 0;
|
||||||
|
|
||||||
errno = 0;
|
errno = 0;
|
||||||
intval = strtol(str, &end, 10);
|
intval = strtol(str, &end, 10);
|
||||||
|
|
||||||
@ -84,6 +86,8 @@ safe_atou32(const char *str, uint32_t *val)
|
|||||||
char *end;
|
char *end;
|
||||||
unsigned long intval;
|
unsigned long intval;
|
||||||
|
|
||||||
|
*val = 0;
|
||||||
|
|
||||||
errno = 0;
|
errno = 0;
|
||||||
intval = strtoul(str, &end, 10);
|
intval = strtoul(str, &end, 10);
|
||||||
|
|
||||||
@ -120,6 +124,8 @@ safe_hextou32(const char *str, uint32_t *val)
|
|||||||
char *end;
|
char *end;
|
||||||
unsigned long intval;
|
unsigned long intval;
|
||||||
|
|
||||||
|
*val = 0;
|
||||||
|
|
||||||
/* A hex shall begin with 0x */
|
/* A hex shall begin with 0x */
|
||||||
if (strncmp(str, "0x", 2) != 0)
|
if (strncmp(str, "0x", 2) != 0)
|
||||||
return safe_atou32(str, val);
|
return safe_atou32(str, val);
|
||||||
@ -160,6 +166,8 @@ safe_atoi64(const char *str, int64_t *val)
|
|||||||
char *end;
|
char *end;
|
||||||
long long intval;
|
long long intval;
|
||||||
|
|
||||||
|
*val = 0;
|
||||||
|
|
||||||
errno = 0;
|
errno = 0;
|
||||||
intval = strtoll(str, &end, 10);
|
intval = strtoll(str, &end, 10);
|
||||||
|
|
||||||
@ -196,6 +204,8 @@ safe_atou64(const char *str, uint64_t *val)
|
|||||||
char *end;
|
char *end;
|
||||||
unsigned long long intval;
|
unsigned long long intval;
|
||||||
|
|
||||||
|
*val = 0;
|
||||||
|
|
||||||
errno = 0;
|
errno = 0;
|
||||||
intval = strtoull(str, &end, 10);
|
intval = strtoull(str, &end, 10);
|
||||||
|
|
||||||
@ -232,6 +242,8 @@ safe_hextou64(const char *str, uint64_t *val)
|
|||||||
char *end;
|
char *end;
|
||||||
unsigned long long intval;
|
unsigned long long intval;
|
||||||
|
|
||||||
|
*val = 0;
|
||||||
|
|
||||||
errno = 0;
|
errno = 0;
|
||||||
intval = strtoull(str, &end, 16);
|
intval = strtoull(str, &end, 16);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user