summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Bielik <robert.bielik@dirac.com>2021-11-11 09:35:31 +0100
committerRobert Bielik <robert.bielik@dirac.com>2021-11-11 09:51:18 +0100
commita66a6cc51b62220a73fe2380bad532df3d42a23b (patch)
tree3eef7fd1a91e4c056d006cfba265a3f27b41e241
parent21f767f63fe4b32ca5607c5530dc6db0d23b6174 (diff)
downloadjson-c-a66a6cc51b62220a73fe2380bad532df3d42a23b.tar.gz
Fix for clang ub sanitizer
-rw-r--r--json_object.c10
-rw-r--r--linkhash.c2
2 files changed, 6 insertions, 6 deletions
diff --git a/json_object.c b/json_object.c
index bf302e5..370e1d1 100644
--- a/json_object.c
+++ b/json_object.c
@@ -1058,8 +1058,7 @@ static int json_object_double_to_json_string_format(struct json_object *jso, str
format_drops_decimals = 1;
looks_numeric = /* Looks like *some* kind of number */
- is_plain_digit(buf[0]) ||
- (size > 1 && buf[0] == '-' && is_plain_digit(buf[1]));
+ is_plain_digit(buf[0]) || (size > 1 && buf[0] == '-' && is_plain_digit(buf[1]));
if (size < (int)sizeof(buf) - 2 && looks_numeric && !p && /* Has no decimal point */
strchr(buf, 'e') == NULL && /* Not scientific notation */
@@ -1283,7 +1282,8 @@ static struct json_object *_json_object_new_string(const char *s, const size_t l
return NULL;
jso->len = len;
memcpy(jso->c_string.idata, s, len);
- jso->c_string.idata[len] = '\0';
+ // Cast below needed for Clang UB sanitizer
+ ((char *)jso->c_string.idata)[len] = '\0';
return &jso->base;
}
@@ -1733,8 +1733,8 @@ static int json_object_deep_copy_recursive(struct json_object *src, struct json_
/* This handles the `json_type_null` case */
if (!iter.val)
jso = NULL;
- else if (json_object_deep_copy_recursive(iter.val, src, iter.key, UINT_MAX, &jso,
- shallow_copy) < 0)
+ else if (json_object_deep_copy_recursive(iter.val, src, iter.key, UINT_MAX,
+ &jso, shallow_copy) < 0)
{
json_object_put(jso);
return -1;
diff --git a/linkhash.c b/linkhash.c
index ec0b995..d2f2b1b 100644
--- a/linkhash.c
+++ b/linkhash.c
@@ -486,7 +486,7 @@ static unsigned long lh_char_hash(const void *k)
#endif
}
- return hashlittle((const char *)k, strlen((const char *)k), random_seed);
+ return hashlittle((const char *)k, strlen((const char *)k), (uint32_t)random_seed);
}
int lh_char_equal(const void *k1, const void *k2)