From patchwork Wed Nov 10 12:50:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jose E. Marchesi" X-Patchwork-Id: 47409 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 643DD385781F for ; Wed, 10 Nov 2021 12:55:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 643DD385781F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1636548909; bh=j3504cHbJ2BROT8mRNlrYjoJKz6OusT8L3hZ9aem9Eg=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Help:List-Subscribe:From:Reply-To:From; b=Q8nQ0eneqyy382VM3nxcC+u60SfqRbGqdIXnG2/OEGG3593fuWXHK8Oq3z9v6ehAa 0qjNFkaRjnWblJblraevs2lUV8F39gvTYeiGR1C/AEbhjURal54YFwVIJ177TaJVJy XK/LAA4+gyiXqHXCRKNvo0Tqk0o7APo/A6etYhW4= X-Original-To: libabigail@sourceware.org Delivered-To: libabigail@sourceware.org Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by sourceware.org (Postfix) with ESMTPS id 066AE3857C7B for ; Wed, 10 Nov 2021 12:51:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 066AE3857C7B Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 1AAClVUB023588 for ; Wed, 10 Nov 2021 12:51:10 GMT Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by mx0b-00069f02.pphosted.com with ESMTP id 3c7yq7cesv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 10 Nov 2021 12:51:06 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.1.2/8.16.1.2) with SMTP id 1AACkhq6081284 for ; Wed, 10 Nov 2021 12:51:00 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2100.outbound.protection.outlook.com [104.47.70.100]) by userp3020.oracle.com with ESMTP id 3c63fujxks-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 10 Nov 2021 12:51:00 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=M2Z40U/MBlrCsjdKjK9yU3e2zIDmUnejf9lB/xDWLEY6OGSm3rKYoMESOHzhkZEJzmCALBunFBgvUf2llDphk/pa7wtDNBFOG09OJHv/9zcHhc/1NZ6bCUVuxUWp6MomNa8DPBd615lXOtvKXFKlcyNdFFBOMoactlPzHFg5gXb4KWjLJJWXhC4Nz8mz3HCnctu7/UJmCvAgZGN3vOiIJqsGRi8UsiOwmiEoFi0BHrgUp+C2HLi/8L2oKd9Yds2cpiof/vg6ks4tmUeRFzOXhhiY+lky+ylCK+aATxWePTPJPkqfuPeFbjPZXTUnniQaycydZ7S4w4LfvFuc43sRLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=j3504cHbJ2BROT8mRNlrYjoJKz6OusT8L3hZ9aem9Eg=; b=kfPKnRx3dFP262rwW8LDE+8kpoPov3ujDBp6/qj9XgfmPeS+RXxlfm9EmeLFaaKgFjabSGenlDiqNlA7AEXRULTg81uKnJ/wein3NbWwAKoiVVgKHyYNdQ0oXx362CRx1y0dvXCApLkHRdMhvecmjcEQAm1tYRALozEiARmwTCYNCbfr8z+4ILIatvQg42yZTV/IMRdTm+fEib46lDWqqLnQLnoJezi5BdxSX5P4YkUHyefCvNIAPIV597WM0TdNT/R7/nqgMeNkP+OWvkPMN3OdjcfmC6Cwc2N2e9aNQh5BLcaITV+aqMHU6GVzkxxlfKEEfEsanwOWIsWsOEn4yg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none Received: from BYAPR10MB2888.namprd10.prod.outlook.com (2603:10b6:a03:88::32) by BYAPR10MB3655.namprd10.prod.outlook.com (2603:10b6:a03:127::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.13; Wed, 10 Nov 2021 12:50:58 +0000 Received: from BYAPR10MB2888.namprd10.prod.outlook.com ([fe80::48bf:86b4:32e1:6574]) by BYAPR10MB2888.namprd10.prod.outlook.com ([fe80::48bf:86b4:32e1:6574%4]) with mapi id 15.20.4669.016; Wed, 10 Nov 2021 12:50:58 +0000 To: libabigail@sourceware.org Subject: [PATCH 2/2] abg-ctf-reader: use the right string table for CTF data Date: Wed, 10 Nov 2021 13:50:50 +0100 Message-Id: <20211110125050.15529-2-jose.marchesi@oracle.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20211110125050.15529-1-jose.marchesi@oracle.com> References: <20211110125050.15529-1-jose.marchesi@oracle.com> X-ClientProxiedBy: LO2P265CA0025.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:61::13) To BYAPR10MB2888.namprd10.prod.outlook.com (2603:10b6:a03:88::32) MIME-Version: 1.0 Received: from termi.localdomain (141.143.193.77) by LO2P265CA0025.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:61::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.16 via Frontend Transport; Wed, 10 Nov 2021 12:50:57 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b0a951d7-3e48-4674-0794-08d9a448be32 X-MS-TrafficTypeDiagnostic: BYAPR10MB3655: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2089; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Q5JxwWbsLSuAhp2nPupL4Ss0osjIkcvsOGV8vEfcDNCx2s4ZXcHSj8lZoiegA/MPqqI6E78lEsSVetdUQ39k73vNfECr0VQnjcge/n5bCq2IxFgH3csu6owWnzsK/nuat4bv9NDu8Rr3+VawyElCeqjfgczJVJwX2GBKUi2ZBLLZjmzGBWahRv5q1kHfEvsx0dA3jb2IumNFKAZ07FONVZ/FxufuADT8WYu+6os06urXtTerc7xkXkQBFAV+1oLU7XwT/q3Obz1qjKSuOws8U2LLPPWf0xLyFv69D5yrN0QI0GCKousSI5ioJw8pBW5x+Id16lD79mqHlA3WlbbPlEnHs+Z9HS99C4r0JSDY5Pn+5U8wtb5S9A6U7gm7ircKKAtcbQofnnsKOawv9r/0AFx9iheZzkFJQ3MW720M09rK6V0dUXPPxKedUIE98vOb8ENwlUhMhLLskyWyxrXpOK2NHo/qxnoh+JLkUPztEfGMH2BGP6GlHvGGhed1Z77aMopDuRkYhaMM3n2tT9UEm17y+Wr9P7qAuAjFcpdOKgGK2Ur5NLdK+HUo0P8mY3OGztupfuVA3xXrr8NK/o/Y0abtdlajEnSbQIIAhJ6SVunMsj3npdwI2VKOPLqk4xUuf8o0HRdizq5AmvhLwYFART37NOE4rWxVbAH0WPGyl9oPqazArmUMSHVarPAiHoAbxljTchIPMPd/PawqiVqYuA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BYAPR10MB2888.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(38350700002)(8936002)(8676002)(508600001)(38100700002)(26005)(6666004)(316002)(36756003)(6512007)(86362001)(6486002)(83380400001)(956004)(6916009)(1076003)(2616005)(186003)(5660300002)(6506007)(2906002)(66946007)(52116002)(66476007)(66556008); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: kZPkm3KriTzCC0mUUh8t2a5tlUy5lkVrwBZqkm61taUIatRwzFHqHaqWv/g/wOTmsn+fgz4SoSxrI5S02A7Q3nCSbap3wiRp7aPo7Ng5EpgF9ItHEt5d+nWA/hhZB3imXKO8jNNcsv1D60qqtBPOeqYqfAhK3XKoYPgPDCqA7x4mTjgtKlglUkQBrCGyEyrC1vC9AzOQNp02PNnDov6pYpwZ8J0moCJlWoEAZU2PbBb8/EiHYKAempvpxrL+wg2T1U3gKFmVukLqK+28tJQLJwr7rCbw+dXbo4KiqpeSk/EzH8e1HlUorhUSjn2Pn/RSPJtchiGaAcCpjlps/vVBTJQA3tXERe9g7UVQUfDj50TptrHVFzAJ3XHC6qKEkArdBqR5Mo0U5cSHbuHDpZkCzkdZAZ085lNZrdvmRgYvtyVi6W4EHYjL780706D5GvMiYxcGIU/27H8aX2WL+tvMTsJ9ae9sMRGtLuwcB0jO6ZK+sTwAZiVfa14OnIi9x5unoGGhxuozeLZSfPH/4YTjYw3v675ACncMvYSazlQR18YAIGrWtp7XsZHA8w1QITFBOfoFjw736nr3bEi2jCrQNUVklI3WByCQ2BUIWlEkLRZDBVp4bn5b/xn9udf3h+4XUuMOaFpAfub7l0bv1mTEIiTIE1TgoncEnMg4fCZL/AwwbWjAXgXv7VtQ1dIDvWLwqUj3kCvjAWLq7FxuKbfmefnlquiZyO8nEopRJObUv3r042GuuufTG89v0QilE14BXRh5yKlqFzfNAOhjdfvdpbYjugWqWVk2dOKZkbImzaOOpriyCsE7hrMAjm2n6a0ZJpgLViNiw1NjlOJtgwShTkzpxcLSKK9QuUvr1rAumbb5Iip9XIOGMtW6eGCSAijL57FPBk0Szjsp3qQ6J4VKfUdUEhM3FG8jaW6DN425HwvQ8SthP50OflEqSH1zwIWrvBTrylXTBS7fPkLKbFbPyf5l0TGkPN8QIQxri/XmMrXXvHdqVG7VFu9RLOHLnADhwYjJhg69R8QEgIqskWDbMKHDvd+jBhIaF+hkhdotXaNG+oXNBS9gBhZF+msJQJ66lGs1eail3D2qP9k4jDpZ+gNc+NwaH+e/OxZrQGTIpcjFaJAOeEl+LjDPxlipmXiwFuYI864U0Upi6uWdsVPc+XRqo9fhQhoawRIPL97neDD6VLxJBaebxawXHuIAeoSN3K9mMYwBbbwuK3V9DKbPJ1cUoPFqYDyVLFWcRfGHInt0ixL83Mz5+C3LlOaNWd/TMmiXk1ccft5PxiEDbwajOVxk7YqH4bRSI/aQLYMa/Y69wx8grgupB1WfVIy5Ysl4Ym7K80HPm3r5yVYZ+UTkfOQHgmkutjB9LlrkOVALIeRSQqWQJ1Ms2TO/FwpOEUXH39bo8/v/Slg26D7c4asP+duhakfQEr7Qq59Xe4bSboPbxSkKkq+9a1K4FLV2nDj6h+A5ZqSqNtKyKw5SEFU7XOZXUwnYn19liNG+kcEvjGT7FGlXLZEgWYDvmTmTrmwAeC4n0l1RBE/ekeM04k/AoVX84pj9A2N1yVa4N7C8LDswitozuqzp1moW62mRXbl3Om7ao1IuXYKcKxncLa//Oh3G3ybOXUn+0RupAVAP0BasRWelUow+ApyFD9uwL6v8i9jiu3J7n8rw1Mz5fgtaMMfChcZM0Goaz25mKfqcOCU= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: b0a951d7-3e48-4674-0794-08d9a448be32 X-MS-Exchange-CrossTenant-AuthSource: BYAPR10MB2888.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 12:50:58.7834 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 32w6PUyZgnSXaFahdnY7kcpphA5sIMlWhvWkJD7Pdvrq5DPNCOOv7TbSLUWDQ+5hJWDWyJN9VkC4ISMTzJjSGdmbMx+6pJ+F/I10omijDps= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR10MB3655 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10163 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=978 spamscore=0 mlxscore=0 bulkscore=0 phishscore=0 suspectscore=0 adultscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2111100067 X-Proofpoint-GUID: -wfCJDV3uzkdRNUMYfGJZVgPO5xmKkQ_ X-Proofpoint-ORIG-GUID: -wfCJDV3uzkdRNUMYfGJZVgPO5xmKkQ_ X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, MSGID_FROM_MTA_HEADER, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, 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: "Jose E. Marchesi via Libabigail" From: "Jose E. Marchesi" Reply-To: "Jose E. Marchesi" Errors-To: libabigail-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libabigail" The CTF library needs the string table associated with the symbol table of the ELF file. This patch makes the CTF reader to use the right string table. Signed-off-by: Jose E. Marchesi * src/abg-ctf-reader.cc (slurp_elf_info): Use find_strtab_for_symtab_section. --- src/abg-ctf-reader.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/abg-ctf-reader.cc b/src/abg-ctf-reader.cc index 51fb2ed9..27eddc2e 100644 --- a/src/abg-ctf-reader.cc +++ b/src/abg-ctf-reader.cc @@ -1040,7 +1040,8 @@ slurp_elf_info(read_context *ctxt, corpus_sptr corp) /* Get the raw ELF section contents for libctf. */ Elf_Scn *ctf_scn = elf_helpers::find_section(ctxt->elf_handler, ".ctf", SHT_PROGBITS); Elf_Scn *symtab_scn = elf_helpers::find_symbol_table_section(ctxt->elf_handler); - Elf_Scn *strtab_scn = elf_helpers::find_section(ctxt->elf_handler, SHT_STRTAB); + Elf_Scn *strtab_scn = elf_helpers::find_strtab_for_symtab_section(ctxt->elf_handler, + symtab_scn); if (ctf_scn == NULL || symtab_scn == NULL || strtab_scn == NULL) return 0;