From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 8B7573858D20 for ; Fri, 3 Feb 2023 11:48:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8B7573858D20 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675424911; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=7axMsGcsmb/TBCwI2wAtucGRVe5/UjpuodYIDmes6p4=; b=hU87uiN2ghQe1TRb4KTb+JjwQHSlrDdvUovQjcyMQrm53TGOA0MyQUpmAOPe/p6gkPd7bE kWgu5i1ouCJbPNtxvUTaALFzDpm5tPhb+yeEegODd+j55eLm1lP6Ys6UfrMzkcI6W2H6kf Opeb3BaqzCAvOEO/p4+GwhwhT0Numls= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-189-Q_Y9wVYUOL-TxwCRtJIHTg-1; Fri, 03 Feb 2023 06:48:30 -0500 X-MC-Unique: Q_Y9wVYUOL-TxwCRtJIHTg-1 Received: by mail-wm1-f70.google.com with SMTP id o5-20020a05600c4fc500b003db0b3230efso4454578wmq.9 for ; Fri, 03 Feb 2023 03:48:29 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=7axMsGcsmb/TBCwI2wAtucGRVe5/UjpuodYIDmes6p4=; b=DcvsJ3kB/hjnPNx0guLDJrIHgqsxZ6vYxzvgXpDu8wVq2AR1Btz/xy1RVGDEJJcNt4 wcYwGyIJVHwYVXLAYdwa6j1oNybswGgdY8aII6M7AxBexCgsw7W4G/7Gx3TWiqvkvv08 q1VtwRM1gktUDWAtRWyJEwKu/XkLgn+jiXpz4YQe+TG0Wv79qV/Z7waiZvrHhP8jSaGU b1YBg6Yl+saBwjwI+47pa6akCGHaCghGFRfDVx4V7983wAF43H60jtbvvHZCQA2HwnwR Op06RDXfWYbc/BVGw4y2VxjTKBYo1/ETQbQwzORX6pQoVoul6QK87M7IDz8PjO/rd8nB ncXQ== X-Gm-Message-State: AO0yUKU1G+8JZImCF8WqwZBENzPrxwnvpVE1p4Cl4Q64n/8K5DCJEiGd 53aYUYhurrWXJ5lk/d4fjkHF+WfZHbq7GzQ34CgzboPS0DxoSZt2bAJ0JX6Gc6jsL6tv4//k5IF 705lvxQKD3c1In/nhmEqu X-Received: by 2002:a5d:508d:0:b0:2c3:da8a:192 with SMTP id a13-20020a5d508d000000b002c3da8a0192mr592311wrt.15.1675424908772; Fri, 03 Feb 2023 03:48:28 -0800 (PST) X-Google-Smtp-Source: AK7set9Z1lvvHtvFRgihoH298nhXcPeG6W1j6iptPGpQntzlEOyBY/ofQoQepncZy8dDDRXXPOxv3A== X-Received: by 2002:a5d:508d:0:b0:2c3:da8a:192 with SMTP id a13-20020a5d508d000000b002c3da8a0192mr592303wrt.15.1675424908579; Fri, 03 Feb 2023 03:48:28 -0800 (PST) Received: from localhost ([88.120.130.27]) by smtp.gmail.com with ESMTPSA id f6-20020a5d5686000000b002c3daaef051sm463081wrv.82.2023.02.03.03.48.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Feb 2023 03:48:28 -0800 (PST) Received: by localhost (Postfix, from userid 1000) id 8CB9D18F6A6; Fri, 3 Feb 2023 12:48:27 +0100 (CET) From: Dodji Seketeli To: libabigail@sourceware.org Cc: gprocida@google.com, Dodji Seketeli Subject: [PATCH 3/4] corpus: Handle empty symbol table cases Organization: Red Hat / France References: <878rhh8xwb.fsf@redhat.com> <87mt5vt3op.fsf@seketeli.org> X-Operating-System: CentOS Stream release 9 X-URL: http://www.redhat.com Date: Fri, 03 Feb 2023 12:48:27 +0100 In-Reply-To: <87mt5vt3op.fsf@seketeli.org> (Dodji Seketeli's message of "Fri, 03 Feb 2023 11:59:34 +0100") Message-ID: <877cwzt1f8.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 Content-Type: text/plain X-Spam-Status: No, score=-11.7 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_H2,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 List-Id: Hello, There can be cases where the symbol table associated with a given corpus is empty. This patch handles those cases to avoid crashes. * src/abg-corpus.cc (corpus::priv::{get_sorted_fun_symbols, get_sorted_undefined_fun_symbols, get_sorted_var_symbols, get_sorted_undefined_var_symbols}): If the symbol is null, then return an empty vector of symbols. Signed-off-by: Dodji Seketeli --- src/abg-corpus.cc | 58 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 40 insertions(+), 18 deletions(-) diff --git a/src/abg-corpus.cc b/src/abg-corpus.cc index b6f760bb..4f20a888 100644 --- a/src/abg-corpus.cc +++ b/src/abg-corpus.cc @@ -313,9 +313,15 @@ corpus::priv::get_sorted_fun_symbols() const { if (!sorted_fun_symbols) { - auto filter = symtab_->make_filter(); - filter.set_functions(); - sorted_fun_symbols = elf_symbols(symtab_->begin(filter), symtab_->end()); + if (symtab_) + { + auto filter = symtab_->make_filter(); + filter.set_functions(); + sorted_fun_symbols = elf_symbols(symtab_->begin(filter), + symtab_->end()); + } + else + sorted_fun_symbols = elf_symbols(); } return *sorted_fun_symbols; } @@ -349,13 +355,18 @@ corpus::priv::get_sorted_undefined_fun_symbols() const { if (!sorted_undefined_fun_symbols) { - auto filter = symtab_->make_filter(); - filter.set_functions(); - filter.set_undefined_symbols(); - filter.set_public_symbols(false); + if (symtab_) + { + auto filter = symtab_->make_filter(); + filter.set_functions(); + filter.set_undefined_symbols(); + filter.set_public_symbols(false); - sorted_undefined_fun_symbols = - elf_symbols(symtab_->begin(filter), symtab_->end()); + sorted_undefined_fun_symbols = + elf_symbols(symtab_->begin(filter), symtab_->end()); + } + else + sorted_undefined_fun_symbols = elf_symbols(); } return *sorted_undefined_fun_symbols; } @@ -446,10 +457,16 @@ corpus::priv::get_sorted_var_symbols() const { if (!sorted_var_symbols) { - auto filter = symtab_->make_filter(); - filter.set_variables(); + if (symtab_) + { + auto filter = symtab_->make_filter(); + filter.set_variables(); - sorted_var_symbols = elf_symbols(symtab_->begin(filter), symtab_->end()); + sorted_var_symbols = elf_symbols(symtab_->begin(filter), + symtab_->end()); + } + else + sorted_var_symbols = elf_symbols(); } return *sorted_var_symbols; } @@ -483,13 +500,18 @@ corpus::priv::get_sorted_undefined_var_symbols() const { if (!sorted_undefined_var_symbols) { - auto filter = symtab_->make_filter(); - filter.set_variables(); - filter.set_undefined_symbols(); - filter.set_public_symbols(false); + if (symtab_) + { + auto filter = symtab_->make_filter(); + filter.set_variables(); + filter.set_undefined_symbols(); + filter.set_public_symbols(false); - sorted_undefined_var_symbols = - elf_symbols(symtab_->begin(filter), symtab_->end()); + sorted_undefined_var_symbols = + elf_symbols(symtab_->begin(filter), symtab_->end()); + } + else + sorted_undefined_var_symbols = elf_symbols(); } return *sorted_undefined_var_symbols; } -- 2.31.1 -- Dodji