]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
Remove workaround for ancient clang versions (<< 3.2 and << 4.0.1)
authorOndřej Surý <ondrej@isc.org>
Sat, 5 Mar 2022 12:46:52 +0000 (13:46 +0100)
committerOndřej Surý <ondrej@isc.org>
Fri, 25 Mar 2022 08:37:22 +0000 (09:37 +0100)
Some ancient versions of clang reported uninitialized memory use false
positive (see https://bugs.llvm.org/show_bug.cgi?id=14461).  Since clang
4.0.1 has been long obsoleted, just remove the workarounds.

(cherry picked from commit ae508c17bcf9a5c67a5c889f79624449f1e998d6)

lib/dns/name.c
lib/dns/tsig.c

index 5233eedbd30b65971f0f981708c9f25f6101ecc0..7d92e3150513c56a0905350978ef334b197235f8 100644 (file)
@@ -853,12 +853,6 @@ dns_name_matcheswildcard(const dns_name_t *name, const dns_name_t *wname) {
        REQUIRE(labels > 0);
        REQUIRE(dns_name_iswildcard(wname));
 
-#if defined(__clang__) && \
-       (__clang_major__ < 3 || (__clang_major__ == 3 && __clang_minor__ < 2))
-       memset(&tname, 0, sizeof(tname));
-#endif /* if defined(__clang__) && (__clang_major__ < 3 || (__clang_major__ == \
-       * 3                                                                    \
-       * && __clang_minor__ < 2)) */
        DNS_NAME_INIT(&tname, NULL);
        dns_name_getlabelsequence(wname, 1, labels - 1, &tname);
        if (dns_name_fullcompare(name, &tname, &order, &nlabels) ==
@@ -1977,12 +1971,6 @@ dns_name_towire2(const dns_name_t *name, dns_compress_t *cctx,
         * has one.
         */
        if (name->offsets == NULL) {
-#if defined(__clang__) && \
-       (__clang_major__ < 3 || (__clang_major__ == 3 && __clang_minor__ < 2))
-               memset(&clname, 0, sizeof(clname));
-#endif /* if defined(__clang__) && (__clang_major__ < 3 || (__clang_major__ == \
-       * 3                                                                    \
-       * && __clang_minor__ < 2)) */
                DNS_NAME_INIT(&clname, clo);
                dns_name_clone(name, &clname);
                name = &clname;
@@ -2301,12 +2289,6 @@ dns_name_digest(const dns_name_t *name, dns_digestfunc_t digest, void *arg) {
        REQUIRE(VALID_NAME(name));
        REQUIRE(digest != NULL);
 
-#if defined(__clang__) && \
-       (__clang_major__ < 3 || (__clang_major__ == 3 && __clang_minor__ < 2))
-       memset(&downname, 0, sizeof(downname));
-#endif /* if defined(__clang__) && (__clang_major__ < 3 || (__clang_major__ == \
-       * 3                                                                    \
-       * && __clang_minor__ < 2)) */
        DNS_NAME_INIT(&downname, NULL);
 
        isc_buffer_init(&buffer, data, sizeof(data));
index c16f3b5c4637f32befff70b84c890158c7c474f6..b4c9baf6ad9ee82e29ed313b00d24bd7436cb9a7 100644 (file)
@@ -1149,18 +1149,6 @@ dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg,
                        return (ret);
                }
        }
-#if defined(__clang__) && (__clang_major__ < 3 ||                           \
-                          (__clang_major__ == 3 && __clang_minor__ < 2) || \
-                          (__clang_major__ == 4 && __clang_minor__ < 2))
-       /* false positive: http://llvm.org/bugs/show_bug.cgi?id=14461 */
-       else
-       {
-               memset(&querytsig, 0, sizeof(querytsig));
-       }
-#endif /* if defined(__clang__) && (__clang_major__ < 3 || (__clang_major__ == \
-       * 3                                                                    \
-       * && __clang_minor__ < 2) || (__clang_major__ == 4 && __clang_minor__  \
-       * < 2)) */
 
        /*
         * Do the key name and algorithm match that of the query?