Fix #1444 - clang warns on undefined behavior with null pointers

This commit is contained in:
Sergey Lyubka committed 2022-01-14 09:55:15 +00:00
1 parent 9fd80fd136
commit c53e2fcc14
3 files changed
+8 -6

No files matched your search

+3 -2
View File
@@ -113,8 +113,9 @@ static size_t mg_nce(const char *s, size_t n, size_t ofs, size_t *koff,
}
bool mg_commalist(struct mg_str *s, struct mg_str *k, struct mg_str *v) {
size_t koff = 0, klen = 0, voff = 0, vlen = 0;
size_t off = mg_nce(s->ptr, s->len, 0, &koff, &klen, &voff, &vlen);
size_t koff = 0, klen = 0, voff = 0, vlen = 0, off = 0;
if (s->ptr == NULL || s->len == 0) return 0;
off = mg_nce(s->ptr, s->len, 0, &koff, &klen, &voff, &vlen);
if (k != NULL) *k = mg_str_n(s->ptr + koff, klen);
if (v != NULL) *v = mg_str_n(s->ptr + voff, vlen);
*s = mg_str_n(s->ptr + off, s->len - off);