From patchwork Thu Sep 7 13:40:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dodji Seketeli X-Patchwork-Id: 75447 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 F3EEF3893653 for ; Thu, 7 Sep 2023 13:40:31 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F3EEF3893653 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1694094032; bh=0Is6ihi1y4xvAVc3QekW5C8ogZfkm4aieT2iTYhbKk0=; h=To:Cc:Subject:References:Date:In-Reply-To:List-Id: List-Unsubscribe:List-Archive:List-Help:List-Subscribe:From: Reply-To:From; b=G7DuhYuJL80wLFAQbXpl0q9X6rB2LyWxo/+Kmj5tyLrhqOm8kbh+le552iCUyly0T 5YSRCm4067yLTys6d7XvTKdSNioRjQH1YP7L3ij6aYhacbgyMoAmTTRuzMLL37dZ87 A2pcfSdhe9iAXfJ3WCLAQtFzsa4PYxcJKc/0R/qw= 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 [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 797513945C1C for ; Thu, 7 Sep 2023 13:40:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 797513945C1C Received: from mail-ot1-f71.google.com (mail-ot1-f71.google.com [209.85.210.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-38-gKTK3QsFOQOlZ6J4lsBFPg-1; Thu, 07 Sep 2023 09:40:24 -0400 X-MC-Unique: gKTK3QsFOQOlZ6J4lsBFPg-1 Received: by mail-ot1-f71.google.com with SMTP id 46e09a7af769-6b9d8b76be5so1073342a34.1 for ; Thu, 07 Sep 2023 06:40:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1694094024; x=1694698824; h=mime-version:user-agent:message-id:in-reply-to:date:references :organization:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0Is6ihi1y4xvAVc3QekW5C8ogZfkm4aieT2iTYhbKk0=; b=EwxiXptDEDDgK9IqYRa7lJiTrB2/O48YPit2sIeCoI7L1dlVrp3DEfIlLUC1dEYP65 fuE1YMdrLy2KSyyZwh3n4x4fe7kmiqsg/bZ0KXM0gQOPacCha3gmU2d2Affya5sklzVT KfVw9Edp9xusdERu9yDlJ3x02p8nEDg6s+UDkFqJ38HF7az04pF34RYrYcZ0VEnSSYa3 BSNTOS3+FSijhrv3kdlrnEbiCi7c6pMzFribp8LtqvSmKI+jZYGkDUDRLLj3G2bQK49l RS3sG5wjkbJtgqchJdIMWz0NhqQeUcQblHRn4zO/pKqngzMGTy4q+nd6IveQesrSQ1PK CW1Q== X-Gm-Message-State: AOJu0Yypv8ldFhDPH0JGOg3gbYl0bnqDmh35JzICvQLcfa4+qJ3zdgku XH+7nLncPTFsAUVIyOSKZj8+7FqW96e1JhMzeKEiLxm3UBxN+t1mrByPXMNvWbamB8maLBmwU33 R4+hP5m3ItZnjcxoBvF1z X-Received: by 2002:a05:6830:1e10:b0:6bc:f5b7:77e0 with SMTP id s16-20020a0568301e1000b006bcf5b777e0mr19668731otr.31.1694094024180; Thu, 07 Sep 2023 06:40:24 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF54tzn0ouBzp6DcPcWhVDE78RnoRjNygXz6R1V8Do4ifySnbDOZ1IEVyQTlgkXjWS6lrreYg== X-Received: by 2002:a05:6830:1e10:b0:6bc:f5b7:77e0 with SMTP id s16-20020a0568301e1000b006bcf5b777e0mr19668724otr.31.1694094023953; Thu, 07 Sep 2023 06:40:23 -0700 (PDT) Received: from localhost ([88.120.130.27]) by smtp.gmail.com with ESMTPSA id j15-20020a0cc34f000000b00655935bca82sm2182856qvi.134.2023.09.07.06.40.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Sep 2023 06:40:23 -0700 (PDT) Received: by localhost (Postfix, from userid 1000) id 1877EB4FD2; Thu, 7 Sep 2023 15:40:22 +0200 (CEST) To: Dodji Seketeli Cc: libabigail@sourceware.org Subject: [PATCH 06/16] tools-utils: Avoid endless loop Organization: Red Hat / France References: <87il8mglc1.fsf@redhat.com> X-Operating-System: CentOS Stream release 9 X-URL: http://www.redhat.com Date: Thu, 07 Sep 2023 15:40:22 +0200 In-Reply-To: <87il8mglc1.fsf@redhat.com> (Dodji Seketeli's message of "Thu, 07 Sep 2023 15:32:46 +0200") Message-ID: <87r0naf6ex.fsf@redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.9 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_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libabigail@sourceware.org X-Mailman-Version: 2.1.30 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" Heloo, * src/abg-tools-utils.cc (is_dir): Avoid endless loop. Signed-off-by: Dodji Seketeli Applied to master. --- src/abg-tools-utils.cc | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/abg-tools-utils.cc b/src/abg-tools-utils.cc index 62a0ebb1..e7155846 100644 --- a/src/abg-tools-utils.cc +++ b/src/abg-tools-utils.cc @@ -567,10 +567,18 @@ is_dir(const string& path) if (S_ISDIR(st.st_mode)) return true; - string symlink_target_path; - if (maybe_get_symlink_target_file_path(path, symlink_target_path)) - return is_dir(symlink_target_path); + if (S_ISLNK(st.st_mode)) + { + string symlink_target_path; + if (maybe_get_symlink_target_file_path(path, symlink_target_path)) + { + if (!get_stat(path, &st)) + return false; + if (S_ISDIR(st.st_mode)) + return true; + } + } return false; }