From 60cf40599a8d7984f9b9459e8f7b2a4e75052d97 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Thu, 7 Mar 2024 00:46:19 +0000 Subject: [PATCH 1/2] escape: fix operator precedence in overflow check CID#1535100 Follow-up for c6342e35b07f750771f0fdb3c80a27d3272e8001 --- src/basic/escape.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/basic/escape.c b/src/basic/escape.c index e7f90a4594..2067be4092 100644 --- a/src/basic/escape.c +++ b/src/basic/escape.c @@ -454,7 +454,7 @@ char* octescape(const char *s, size_t len) { if (len == SIZE_MAX) len = strlen(s); - if (len > (SIZE_MAX)-1/4) + if (len > (SIZE_MAX - 1) / 4) return NULL; t = buf = new(char, len * 4 + 1); From 4365a481b658e7825045a027352fef4db6d8c898 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Thu, 7 Mar 2024 00:51:43 +0000 Subject: [PATCH 2/2] resolve: disambiguate return statement This works as expected, but coverity warns that it could be ambiguous and context suggests the other way around. Add brackets to disambiguate. CID#1535101 Follow-up for 6399be223b73ce520654242ad08de387b08b738a --- src/resolve/resolved-dns-synthesize.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/resolve/resolved-dns-synthesize.c b/src/resolve/resolved-dns-synthesize.c index 6f483fdf0e..4e079864ec 100644 --- a/src/resolve/resolved-dns-synthesize.c +++ b/src/resolve/resolved-dns-synthesize.c @@ -450,7 +450,7 @@ bool shall_synthesize_own_hostname_rrs(void) { if (r < 0 && r != -ENXIO) log_debug_errno(r, "Failed to parse $SYSTEMD_RESOLVED_SYNTHESIZE_HOSTNAME: %m"); - return (cached = r != 0); + return (cached = (r != 0)); } int dns_synthesize_answer(