From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gproxy2-pub.mail.unifiedlayer.com (gproxy2-pub.mail.unifiedlayer.com [69.89.18.3]) by sourceware.org (Postfix) with ESMTPS id E48A83858C60 for ; Tue, 20 Jun 2023 17:36:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E48A83858C60 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com Received: from cmgw10.mail.unifiedlayer.com (unknown [10.0.90.125]) by progateway4.mail.pro1.eigbox.com (Postfix) with ESMTP id 4E64010041A26 for ; Tue, 20 Jun 2023 17:36:40 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id BfHUqsur40JMxBfHUqz1sy; Tue, 20 Jun 2023 17:36:40 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=BMF2EHcG c=1 sm=1 tr=0 ts=6491e3a8 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=IkcTkHD0fZMA:10:nop_charset_1 a=of4jigFt-DYA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=-WLSc_iqiB_2-lDQ3vUA:9 a=QEXdDO2ut3YA:10:nop_charset_2 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=To:In-Reply-To:References:Message-Id:Content-Transfer-Encoding: Content-Type:MIME-Version:Subject:Date:From:Sender:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=mDXBAsEJR61lei+S4sEVvor0Uy/Ch1DHCXteOekqpXs=; b=Ye7EXX6hM/7lll9lzg1t3+x6WR oQSIxrlltK7MhUrbscxEknMgj3fk+lwVs7/sTT8lp7BXPhy4BZLvVua18xmT4/+f4675v/u711UFN 6iEjEIEZlM8bwNDzUmQvzMyC3; Received: from 75-166-136-83.hlrn.qwest.net ([75.166.136.83]:54256 helo=[192.168.0.21]) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1qBfHU-001PQG-5W for gdb-patches@sourceware.org; Tue, 20 Jun 2023 11:36:40 -0600 From: Tom Tromey Date: Tue, 20 Jun 2023 11:36:44 -0600 Subject: [PATCH v2 8/8] Use ARRAY_SIZE in ax-general.c MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20230619-ax-new-v2-8-47638d750dd7@tromey.com> References: <20230619-ax-new-v2-0-47638d750dd7@tromey.com> In-Reply-To: <20230619-ax-new-v2-0-47638d750dd7@tromey.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.2 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 75.166.136.83 X-Source-L: No X-Exim-ID: 1qBfHU-001PQG-5W X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 75-166-136-83.hlrn.qwest.net ([192.168.0.21]) [75.166.136.83]:54256 X-Source-Auth: tom+tromey.com X-Email-Count: 17 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3025.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,GIT_PATCH_0,JMQ_SPF_NEUTRAL,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE 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: This changes a couple of spots in ax-general.c to use ARRAY_SIZE. While making this change, I noticed that one of the bounds checks was incorrect. --- gdb/ax-general.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gdb/ax-general.c b/gdb/ax-general.c index 4ace2b490c0..3c724a0e38b 100644 --- a/gdb/ax-general.c +++ b/gdb/ax-general.c @@ -353,8 +353,7 @@ ax_print (struct ui_file *f, struct agent_expr *x) { enum agent_op op = (enum agent_op) x->buf[i]; - if (op >= (sizeof (aop_map) / sizeof (aop_map[0])) - || !aop_map[op].name) + if (op >= ARRAY_SIZE (aop_map) || aop_map[op].name == nullptr) { gdb_printf (f, _("%3d \n"), i, op); i++; @@ -454,7 +453,7 @@ ax_reqs (struct agent_expr *ax) for (i = 0; i < ax->buf.size (); i += 1 + op->op_size) { - if (ax->buf[i] > (sizeof (aop_map) / sizeof (aop_map[0]))) + if (ax->buf[i] >= ARRAY_SIZE (aop_map)) { ax->flaw = agent_flaw_bad_instruction; return; -- 2.39.2