From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <38AuwXggKCsMpy0xlrmjpxxpun.lxvurkjkrpjru1x30ln5j0n.x0p@flex--gprocida.bounces.google.com> Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by sourceware.org (Postfix) with ESMTPS id 770203870914 for ; Mon, 4 May 2020 12:34:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 770203870914 Received: by mail-yb1-xb49.google.com with SMTP id r18so837156ybg.10 for ; Mon, 04 May 2020 05:34:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=AmSf1s5Gg+NOcLO2vwV02OUWPXevoFpvwwFqflo3zZo=; b=Nrb9nlAloeNjDAflzYI6d6CM/PQ2/0kY+AfK36LCWi3YpM9xdghUw+lyOFn1xoQ/qq BpGp5GhPrpGsQbPkfjc2YTHG9dpbVRBLCcq924IK2SAgjjODxK/zbjig81aCkzV1fzNK AgdQSti2MH9dTBXRgfK+EH/AQEyz1gWNoQke6WpCwQpgyzBq6k/2ZqFHIeU6ZxSRy4aU ztR1hUxt61a9Ncg6Jp3Yj19fwDLsiEB5NlMTUjuZHe+yIhXHruSKF+joreDh3WHsuj9R DU/6AOny6SJTgzXoaRxG7ZiR0psmqI4i13e9rfWIDBgExG+KtefNe0H4hjVJRqROGcxu CDPQ== X-Gm-Message-State: AGi0PubRQhM4KrHA4INfQuv1LQPTN+SaiONOZdTGbeNvsLvOvAUeni8I OmczCFzACPgDOQioVTPERwYLh2gbEbdh5xBlAB8ZXpLOOGx41XQguiuTXqvUQ6HRCDxrHxHKwJz fw1rSgbFTkNfapVpBM5tBUWiNJ+wtHgAj35FKOKenwIvBeZG7+gIKZODuPlL48tZkR7g9JZU= X-Google-Smtp-Source: APiQypJ2XLVvRRapAagz5q89cy2FV61HUCTH2TDjkbROZ2MNgkWmcfvmBkqLuA5V5ybPAcDngYBP/p1yTyFEUg== X-Received: by 2002:a25:c74e:: with SMTP id w75mr26480288ybe.465.1588595696947; Mon, 04 May 2020 05:34:56 -0700 (PDT) Date: Mon, 4 May 2020 13:34:16 +0100 In-Reply-To: <20200504123416.243214-1-gprocida@google.com> Message-Id: <20200504123416.243214-16-gprocida@google.com> Mime-Version: 1.0 References: <20200424092132.150547-1-gprocida@google.com> <20200504123416.243214-1-gprocida@google.com> X-Mailer: git-send-email 2.26.2.526.g744177e7f7-goog Subject: [PATCH v4 15/15] abg-tools-utils.cc: Assert generated regexes OK. From: Giuliano Procida To: libabigail@sourceware.org Cc: dodji@seketeli.org, kernel-team@android.com, gprocida@google.com, maennich@google.com Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-34.0 required=5.0 tests=BAYES_00, DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libabigail@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libabigail mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 May 2020 12:34:58 -0000 There are a couple of places where regexes are generated internally. Assert they compile OK. This is just paranoia. There should be no behavioural changes. * src/abg-tools-utils.cc (handle_file_entry): Assert internally-generated regex compiles. (gen_suppr_spec_from_kernel_abi_whitelists): Assert internally-generated regex compiles. Reviewed-by: Matthias Maennich Signed-off-by: Giuliano Procida --- src/abg-tools-utils.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/abg-tools-utils.cc b/src/abg-tools-utils.cc index fe0de750..3af9fc49 100644 --- a/src/abg-tools-utils.cc +++ b/src/abg-tools-utils.cc @@ -1818,6 +1818,7 @@ handle_file_entry(const string& file_path, // Types that are defined in system headers are usually // OK to be considered as public types. regex::regex_t_sptr headers_regex = regex::compile("^/usr/include/"); + ABG_ASSERT(headers_regex); suppr->set_source_location_to_keep_regex(headers_regex); suppr->set_is_artificial(true); } @@ -2008,6 +2009,7 @@ gen_suppr_spec_from_kernel_abi_whitelists // the function and variable names expressed in the white list. regex::regex_t_sptr regex = regex::compile(regex::generate_from_strings(whitelisted_names)); + ABG_ASSERT(regex); // Build a suppression specification which *keeps* functions // whose ELF symbols match the regular expression contained -- 2.26.2.526.g744177e7f7-goog