From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <3RrihXggKCjkbkmjXdYVbjjbgZ.XjhgdWVWdbVdgnjpmXZrVmZ.jmb@flex--gprocida.bounces.google.com> Received: from mail-wm1-x34a.google.com (mail-wm1-x34a.google.com [IPv6:2a00:1450:4864:20::34a]) by sourceware.org (Postfix) with ESMTPS id D2355395A40E for ; Thu, 23 Apr 2020 15:46:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org D2355395A40E Received: by mail-wm1-x34a.google.com with SMTP id t62so2215705wma.0 for ; Thu, 23 Apr 2020 08:46:15 -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=PrLGuk85KR/pGoyKpbrGXzRTohZuD0AuIZxOzCEhU9k=; b=ADBYy7NNnP6dmbtlrhoQKBjBArLw2QT4uC2+brSW5e6/msgbBhm4FoZFebbsgudCTd IV7pMYjspUM5RktHP/Aisz6wTv6o5L1uxqeiOSHYvP1M52nFaOXhU2SBZMf7/GvmKNEG B+A68M0SGv04tTcYJ3LrhbZY96GtyVlZUa/cR1Xq/gAYvXzlNBwkMqqJvDcZPoHY7P/B /tWSxY9jts6ejfk5tKsaB/K2xf9bkF82xddkg90KUCW6gxonJydGuDol+LGY4697+fVk Ke/XQjyH5hQkpRuyWZc0lSymE2QELVd6NC5TT8BY2jAVjVvg38HRJ7Y/Ph2p36MIAvok olpQ== X-Gm-Message-State: AGi0PuZ19KuTTjslbL9IRye4B+o4I5+8/+DlDCOjinkZvnQZ0YWb1SBG xz2bVP6HREazExJ0/tMN9niuEpS93RHKjFw6l872V0nqwB5vp79+PcoqDr3wJeFX11oWp0XDxuK 6zBHibBMFHg8ad/Dk6+Af8lmIA7rJ9AfDbGsKyPE6+tq+b43YXALm9y/3aCDboPUAzCGrppA= X-Google-Smtp-Source: APiQypKrPOy2NWBA/AQa1kXsJTiKDbfWnWpTo9hgLE61eA0T16mJZ1Q88+vVBkeZbvAG0NGLrSFWai8euDW/+A== X-Received: by 2002:adf:fe45:: with SMTP id m5mr6025013wrs.124.1587656774839; Thu, 23 Apr 2020 08:46:14 -0700 (PDT) Date: Thu, 23 Apr 2020 16:44:36 +0100 In-Reply-To: <20200423154441.170531-1-gprocida@google.com> Message-Id: <20200423154441.170531-17-gprocida@google.com> Mime-Version: 1.0 References: <20200423154441.170531-1-gprocida@google.com> X-Mailer: git-send-email 2.26.1.301.g55bc3eb7cb9-goog Subject: [PATCH 16/21] 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=-33.8 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: Thu, 23 Apr 2020 15:46:17 -0000 There are a couple of places where regexes are generated interally. 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. 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.1.301.g55bc3eb7cb9-goog