From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg1-x535.google.com (mail-pg1-x535.google.com [IPv6:2607:f8b0:4864:20::535]) by sourceware.org (Postfix) with ESMTPS id 875DD385735F for ; Wed, 26 Oct 2022 05:07:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 875DD385735F Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-pg1-x535.google.com with SMTP id q71so13750395pgq.8 for ; Tue, 25 Oct 2022 22:07:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-disposition:mime-version:message-id:subject:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=SgrffpC0AkEYvBwQMhhw91Pl6kKKDbqlOTetEAe2r3A=; b=WWcPlBrdocJnGWB/Bnd9rz8l6WPXETkV6I1tgR3RtpjZIvb3ONmNSTIGGo2HmQGWgv lde7wDKFcsOBptjbp/rrzVH/LKbSqA7Q2Aq9f8ui3HvSWNcfdF64M/ByokhuVyVJyyRk Ac+8A8+7+L/bZt+6i4tEqeDuwzNSAkIj60/w6tfYgQYWJZIJCUJECSfu2hzm+YB6iHJI 1gPQBUCrcAEnKwze62s86GifVkVmAEkXghJK1Zgv9s5le/CEGVdj/l/fC81MstgZAs+I tBlXVROPNw6/8a95F85Jd53pRqXl2dD9+zd9HsVQsRJ6M6FYJhnsvRwV65wSlLDDKuTV pWGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-disposition:mime-version:message-id:subject:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=SgrffpC0AkEYvBwQMhhw91Pl6kKKDbqlOTetEAe2r3A=; b=7cASyIazrSW6zC0+ZzA6gq2L7lOsjzATD0/1aNE16UTElWOevTYSJGljRRhJia9jgZ 6oT75ViejXiFEjHX5Ee5xKsZYHhiNclVrtf6HnNp2SnSzPrFnV1P1YpWENB1JuMy2Vdr 8TzItw91v8kBDBC78jkkq+/mmyFMQ8wqjb4me8uRM6K06JXGO+HlRT/YjJeFcwSG2Joc rhTIZjyyk8f0mNwFLC5ITQ04DMGC8Ge5m9gdlDT7thFkiXnbIIo6vS1SbepLxZDceqeV Li85mPe1N6CCnc2rRwVm3RxvgRFo00GiaQIStLAfMDQ7cuAM2SbZfG+d3XAhSQTExwLA aKMQ== X-Gm-Message-State: ACrzQf1l8jGdvqaMbgM2vxK0GHrhHn2J+BrZCgfbDXNbD7WnPAIFNZqo iKOevRNz9ah5TD2Ma/TwYBlsX+zsKPM= X-Google-Smtp-Source: AMsMyM6lhBm2Vs1wjklkTzXHOk+jej5Fa8KojBT1/ycMTcMlyaik73iN0j/ZgH4ItTzyoWWUUEUb2A== X-Received: by 2002:a05:6a00:18a8:b0:56c:702a:5f49 with SMTP id x40-20020a056a0018a800b0056c702a5f49mr111750pfh.1.1666760847221; Tue, 25 Oct 2022 22:07:27 -0700 (PDT) Received: from squeak.grove.modra.org (158.106.96.58.static.exetel.com.au. [58.96.106.158]) by smtp.gmail.com with ESMTPSA id c11-20020a170902d48b00b001869f2120a6sm2040403plg.108.2022.10.25.22.07.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Oct 2022 22:07:23 -0700 (PDT) Received: by squeak.grove.modra.org (Postfix, from userid 1000) id 672F811407A8; Wed, 26 Oct 2022 15:37:19 +1030 (ACDT) Date: Wed, 26 Oct 2022 15:37:19 +1030 From: Alan Modra To: binutils@sourceware.org Subject: PR29720, objdump -S crashes if build-id is missing Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Status: No, score=-3036.3 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,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: PR 29720 * objdump.c (slurp_file): Don't call debuginfod_find_source when build_id is NULL. diff --git a/binutils/objdump.c b/binutils/objdump.c index f7b4695c3e8..a4ab0dbd66c 100644 --- a/binutils/objdump.c +++ b/binutils/objdump.c @@ -1879,17 +1879,19 @@ slurp_file (const char * fn, #if HAVE_LIBDEBUGINFOD if (fd < 0 && use_debuginfod && fn[0] == '/' && abfd != NULL) { - unsigned char * build_id; - debuginfod_client * client; + unsigned char *build_id = get_build_id (abfd); - client = debuginfod_begin (); - if (client == NULL) - return NULL; + if (build_id) + { + debuginfod_client *client = debuginfod_begin (); - build_id = get_build_id (abfd); - fd = debuginfod_find_source (client, build_id, 0, fn, NULL); - free (build_id); - debuginfod_end (client); + if (client) + { + fd = debuginfod_find_source (client, build_id, 0, fn, NULL); + debuginfod_end (client); + } + free (build_id); + } } #endif -- Alan Modra Australia Development Lab, IBM