From patchwork Wed Sep 8 14:19:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dodji Seketeli X-Patchwork-Id: 44905 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 552AE3861970 for ; Wed, 8 Sep 2021 14:20:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 552AE3861970 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1631110825; bh=ayxpMEqFUmAV10TipyntVI/+BsbffLyIahzW/TVGNSE=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Help: List-Subscribe:From:Reply-To:From; b=rScBrNvVBVvh31T/EmYsJ6jiYcxwxaNoKf/U2j5LlNs77gDYvUY2pc1xGq+CBMe5C BRKf69XcnZL27YJOhHKTRbbrfCjC36Iis7HVWcKYeyscPDlt+8OFlCMvL1mV/FvUJp +U+zxtpv+0NP/j5LMmY7AXGMYo5sgKPXCjgEdVg4= X-Original-To: libabigail@sourceware.org Delivered-To: libabigail@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id 81AFA3858414 for ; Wed, 8 Sep 2021 14:20:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 81AFA3858414 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-211-JZuJ5LNwPqeG9l27Sx1PmA-1; Wed, 08 Sep 2021 10:20:19 -0400 X-MC-Unique: JZuJ5LNwPqeG9l27Sx1PmA-1 Received: by mail-wr1-f69.google.com with SMTP id l12-20020a5d410c000000b00159aa62fbb2so558457wrp.3 for ; Wed, 08 Sep 2021 07:20:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:organization:date:message-id :user-agent:mime-version; bh=ayxpMEqFUmAV10TipyntVI/+BsbffLyIahzW/TVGNSE=; b=Jl6LGt2OaC6aRnWcYcYlxjzEPg+ucG+/VQWmW8FI8cnTZPzgTNZcOmic6mlt07BWnK kjd+q0KCc2PXcfMlTQlD4eQcB+Y6Zd2gFLZxMQB6RlhsxXT4yAMW+YRhx58Y9o4NH3Sg YAPyVTUe6guXj7Si2Qic2abK+ei2PpZoJpvqAHLa7YUXTFGuPcn1V747czhj2P2kGAK3 ZztY2Y2Cyrt2G3AUwCTUu6rhL5/bNbtMkcVFX7IrkSrxdBNUy5SYRW+eR23W++T9zFVu e5UnWgnJg4AavvpdPIMsopzhN3cS9KiC51BYjX6A7XIUjMynKsVSBkYxjCBc08kJzX08 /Urg== X-Gm-Message-State: AOAM532H/MgeLdRsl2TquwgaZZIKjL8iskIIgw3uK4FKqjBBW3mHBIMM 53ZmL2XO3q4dslieC8eCsSeGQRzBI626i3y8b9axm67F+UKKTJeMn1lnM63ltYQ8Oi8ixqwsp/M D+GjhxOXzShLg6EJOhiq3M/7MT7w1Si5JxdYQzOwQMdT2Ud+PcvLKuOMqWtMTIdtv8qL/ X-Received: by 2002:a05:600c:1552:: with SMTP id f18mr3816631wmg.168.1631110817561; Wed, 08 Sep 2021 07:20:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwVZ8VWnj3AjTi9BB1PkRj2a2uNcThaX/T1ql5/K8lVUdy2bgErqfYJgkRj7sHX5AKploLRPw== X-Received: by 2002:a05:600c:1552:: with SMTP id f18mr3816603wmg.168.1631110817228; Wed, 08 Sep 2021 07:20:17 -0700 (PDT) Received: from localhost ([88.120.130.27]) by smtp.gmail.com with ESMTPSA id c2sm2324549wrs.60.2021.09.08.07.20.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Sep 2021 07:20:16 -0700 (PDT) Received: by localhost (Postfix, from userid 1000) id 65E25581C54; Wed, 8 Sep 2021 16:19:36 +0200 (CEST) To: libabigail@sourceware.org Subject: [PATCH, applied] RHBZ1944096 - assertion failure during self comparison of systemd Organization: Red Hat / France X-Operating-System: Fedora 36 X-URL: http://www.redhat.com Date: Wed, 08 Sep 2021 16:19:35 +0200 Message-ID: <87o893f8ug.fsf@redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libabigail@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Mailing list of the Libabigail project List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-Patchwork-Original-From: Dodji Seketeli via Libabigail From: Dodji Seketeli Reply-To: Dodji Seketeli Errors-To: libabigail-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libabigail" Hello, When reading the abixml representing an enumerator which value is exactly either LLONG_MIN or LLONG_MAX, build_enum_type_decl fails because we wrongly think that an underflow or overflow happened, while using strtoll. This patch fixes the condition used to detect {under,over}flow whenusing strtoll. * src/abg-reader.cc (build_enum_type_decl): When strtoll detects an underflow or overflo, it sets errno to ERANGE. So take that into account. Signed-off-by: Dodji Seketeli Applied to master. --- src/abg-reader.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/abg-reader.cc b/src/abg-reader.cc index f4fe4ce8..559f8210 100644 --- a/src/abg-reader.cc +++ b/src/abg-reader.cc @@ -4325,7 +4325,11 @@ build_enum_type_decl(read_context& ctxt, if (a) { value = strtoll(CHAR_STR(a), NULL, 0); - if (value == LLONG_MIN || value == LLONG_MAX) + // when strtoll encounters overflow or underflow, errno + // is set to ERANGE and the returned value is either + // LLONG_MIN or LLONG_MAX. + if ((errno == ERANGE) + && (value == LLONG_MIN || value == LLONG_MAX)) return nil; }