code format

This commit is contained in:
Dominik Maier 2020-08-31 23:59:10 +02:00
parent 4261e17b3e
commit bd57784664

View File

@ -265,7 +265,7 @@ static u8 its_fuzz(afl_state_t *afl, u8 *buf, u32 len, u8 *status) {
} }
static int strntoll(const char *str, size_t sz, char **end, int base, static int strntoll(const char *str, size_t sz, char **end, int base,
long long* out) { long long *out) {
char buf[64]; char buf[64];
long long ret; long long ret;
@ -273,16 +273,13 @@ static int strntoll(const char *str, size_t sz, char **end, int base,
for (; beg && sz && *beg == ' '; beg++, sz--) {}; for (; beg && sz && *beg == ' '; beg++, sz--) {};
if (!sz) if (!sz) return 1;
return 1; if (sz >= sizeof(buf)) sz = sizeof(buf) - 1;
if (sz >= sizeof(buf))
sz = sizeof(buf) -1;
memcpy(buf, beg, sz); memcpy(buf, beg, sz);
buf[sz] = '\0'; buf[sz] = '\0';
ret = strtoll(buf, end, base); ret = strtoll(buf, end, base);
if ((ret == LLONG_MIN || ret == LLONG_MAX) && errno == ERANGE) if ((ret == LLONG_MIN || ret == LLONG_MAX) && errno == ERANGE) return 1;
return 1;
if (end) *end = (char *)beg + (*end - buf); if (end) *end = (char *)beg + (*end - buf);
*out = ret; *out = ret;
@ -291,7 +288,7 @@ static int strntoll(const char *str, size_t sz, char **end, int base,
} }
static int strntoull(const char *str, size_t sz, char **end, int base, static int strntoull(const char *str, size_t sz, char **end, int base,
unsigned long long* out) { unsigned long long *out) {
char buf[64]; char buf[64];
unsigned long long ret; unsigned long long ret;
@ -300,16 +297,13 @@ static int strntoull(const char *str, size_t sz, char **end, int base,
for (; beg && sz && *beg == ' '; beg++, sz--) for (; beg && sz && *beg == ' '; beg++, sz--)
; ;
if (!sz) if (!sz) return 1;
return 1; if (sz >= sizeof(buf)) sz = sizeof(buf) - 1;
if (sz >= sizeof(buf))
sz = sizeof(buf) -1;
memcpy(buf, beg, sz); memcpy(buf, beg, sz);
buf[sz] = '\0'; buf[sz] = '\0';
ret = strtoull(buf, end, base); ret = strtoull(buf, end, base);
if (ret == ULLONG_MAX && errno == ERANGE) if (ret == ULLONG_MAX && errno == ERANGE) return 1;
return 1;
if (end) *end = (char *)beg + (*end - buf); if (end) *end = (char *)beg + (*end - buf);
*out = ret; *out = ret;
@ -350,6 +344,7 @@ static u8 cmp_extend_encoding(afl_state_t *afl, struct cmp_header *h,
use_unum = 1; use_unum = 1;
} else } else
use_num = 1; use_num = 1;
} }