From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gnu.wildebeest.org (wildebeest.demon.nl [212.238.236.112]) by sourceware.org (Postfix) with ESMTPS id 96ADE3858D34 for ; Tue, 16 Jun 2020 22:26:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 96ADE3858D34 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=klomp.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mark@klomp.org Received: from tarox.wildebeest.org (tarox.wildebeest.org [172.31.17.39]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by gnu.wildebeest.org (Postfix) with ESMTPSA id 6055A3000C8B; Wed, 17 Jun 2020 00:25:58 +0200 (CEST) Received: by tarox.wildebeest.org (Postfix, from userid 1000) id 0FD444708689; Wed, 17 Jun 2020 00:25:58 +0200 (CEST) From: Mark Wielaard To: elfutils-devel@sourceware.org Cc: Mark Wielaard Subject: [PATCH 01/10] backends: Make the reloc_nametable zero element an one char array. Date: Wed, 17 Jun 2020 00:25:30 +0200 Message-Id: <20200616222539.29109-1-mark@klomp.org> X-Mailer: git-send-email 2.18.4 X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: elfutils-devel@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Elfutils-devel mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Jun 2020 22:26:01 -0000 We are using the reloc_nametable zero element as an char array. So make that element an actual array (we are actually after one of the next string arrays in the table). Signed-off-by: Mark Wielaard --- backends/ChangeLog | 6 ++++++ backends/common-reloc.c | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/backends/ChangeLog b/backends/ChangeLog index 7d3578b0..c85dfd2a 100644 --- a/backends/ChangeLog +++ b/backends/ChangeLog @@ -1,3 +1,9 @@ +2020-06-16 Mark Wielard + + * common-reloc.c (reloc_nametable): Make zero a 1 char array. + Initialize it as an array { '\0' }. + (reloc_type_name): Access zero as an array. + 2020-06-10 Mark Wielard * aarch64_init.c (aarch64_init): Remove ehlen, return eh. diff --git a/backends/common-reloc.c b/backends/common-reloc.c index 096ed1c7..a91bc87d 100644 --- a/backends/common-reloc.c +++ b/backends/common-reloc.c @@ -45,14 +45,14 @@ static const struct EBLHOOK(reloc_nametable) { - char zero; + char zero[1]; #define RELOC_TYPE(type, uses) \ char name_##type[sizeof R_NAME (type)]; #include RELOC_TYPES #undef RELOC_TYPE } EBLHOOK(reloc_nametable) = { - '\0', + { '\0' }, #define RELOC_TYPE(type, uses) R_NAME (type), #include RELOC_TYPES #undef RELOC_TYPE @@ -92,7 +92,7 @@ EBLHOOK(reloc_type_name) (int reloc, #endif if (reloc >= 0 && reloc < nreloc && EBLHOOK(reloc_nameidx)[reloc] != 0) - return &reloc_namestr[EBLHOOK(reloc_nameidx)[reloc]]; + return reloc_namestr[EBLHOOK(reloc_nameidx)[reloc]]; return NULL; } -- 2.18.4