From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS22989 209.51.188.0/24 X-Spam-Status: No, score=-4.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id 5AF7E1F5AE for ; Fri, 18 Jun 2021 16:05:01 +0000 (UTC) Received: from localhost ([::1]:53402 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luGzM-0000BA-D0 for normalperson@yhbt.net; Fri, 18 Jun 2021 12:05:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43910) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luGfi-0005rl-An for bug-gnulib@gnu.org; Fri, 18 Jun 2021 11:44:42 -0400 Received: from mx0b-00069f02.pphosted.com ([205.220.177.32]:15590) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luGff-0001zP-Is for bug-gnulib@gnu.org; Fri, 18 Jun 2021 11:44:42 -0400 Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 15IFasa2030680 for ; Fri, 18 Jun 2021 15:44:36 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-type : mime-version; s=corp-2020-01-29; bh=BfNmAaO7uJX05vi51G3tZpNB/p3S2drMBLOez+3HJKU=; b=WZP+dKcHORZdry50qlhm4iFFH4sgPizQ0NK8xnJFYeN2biSqQnHk2mVYThHHJknZtpse vX+OlHdTdn+640JQnPDTK23wySJQFaWCrV+6we6VEs2wr1WAtEoS4eu+Oyb1U9UB9V7l vWyHivBZFZbwAyCBtDwToHxWNUvOWIxuV5VfIzYMYONlW/oozZu5VtifA2ll9vvBzNxu EfBRnomV24l/zCQusYjiiHStBHLOgMh5SzWVyKLefr2/qh/h+031nHf62bGIuJLlwmoI J2gqJNRZSS5mQTUIp08m0oKbH/yma1U6MPXCUYaXFl5vdki8A3xUVaXd277AMp0YOtw2 ew== Received: from userp3030.oracle.com (userp3030.oracle.com [156.151.31.80]) by mx0b-00069f02.pphosted.com with ESMTP id 398s5p8khb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 18 Jun 2021 15:44:36 +0000 Received: from pps.filterd (userp3030.oracle.com [127.0.0.1]) by userp3030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 15IFYxsh048789 for ; Fri, 18 Jun 2021 15:44:34 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2102.outbound.protection.outlook.com [104.47.58.102]) by userp3030.oracle.com with ESMTP id 396warhrka-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 18 Jun 2021 15:44:34 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NDTbv4DaAFw7fef7yOKQENSyJMZo5p8aKtGmCxyHEU3FyLMqilCJD1ECLMIErSExqg00GdP454CWVXpnJzetgKCy+KwMtrHmId6VdBn9PKEm+oFJ0JIwFlSSQhWivicU5X3VD5e8wmsiTmDzruGEk6p3LbJGBiljf2jlWUGU80ZJ/i/gCjis/KJbid1TJSUqzG/xENQfxvUrINbuM7WQS1poYxU0YCQgUJmPjrVnHs6zWqbUCCE1HRAgfWik0k+HLT0RFV7ELxUJPcJtUhasI0oc82pxux5gJqZR9y2SAbtOgLWS50CBznRzGwvqy4oMcCricirJZi9S2dpYJrx9vw== 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-SenderADCheck; bh=BfNmAaO7uJX05vi51G3tZpNB/p3S2drMBLOez+3HJKU=; b=gU+cJFYDSO9/IlIsrsmbNDGOCncyhZw7EA1tApNrGLoL9L1fOWZGIf5asKPm+c/Hu4xQ0EbNpoC5hC+VpwoBoTIg6suMkOZPJl/043YdpZMUVyeDEh+80sWICN0E3QJPffBVe9pGU3rXssOe4lOkSxzzru9qqaVc00yElsI0O/KGlEj35S5q3RazuOTQtmK9Swcnl1Vb2eh3ZtsqFsMJFaYyaytX9rZgxYrhWJndgGi+vw1dJynz+CuQdf1rflgNyKk4bGK0nyhqrXO+g2hTYlAFMFk5EPOYUKt0PAX+4drrY9Q3xz7GL2XtxePhCuujFnWE3ZeBK6OMXDLLn99csQ== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BfNmAaO7uJX05vi51G3tZpNB/p3S2drMBLOez+3HJKU=; b=Dm6w4ZCBRUYz2eljG0DeXYYmvKtxyvRQxcwfp8y7+XqsoaPN1ce7mUOXq0r/DoZw4FmguHi/RiqSbEz/Up3UjIY0SNWE4Pg86aZdfC0FM9u5vuSv+rzqQS/5QVoWWmjaLI6qRwCcEDtVfSsjLkPS33SqWel3MklV/jwEQmJC3r8= Authentication-Results: gnu.org; dkim=none (message not signed) header.d=none;gnu.org; dmarc=none action=none header.from=oracle.com; Received: from PH0PR10MB4583.namprd10.prod.outlook.com (2603:10b6:510:43::6) by PH0PR10MB4536.namprd10.prod.outlook.com (2603:10b6:510:40::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.19; Fri, 18 Jun 2021 15:44:33 +0000 Received: from PH0PR10MB4583.namprd10.prod.outlook.com ([fe80::587:a73:b6cf:3f50]) by PH0PR10MB4583.namprd10.prod.outlook.com ([fe80::587:a73:b6cf:3f50%5]) with mapi id 15.20.4242.021; Fri, 18 Jun 2021 15:44:33 +0000 From: Darren Kenny To: bug-gnulib@gnu.org Subject: [PATCH 3/3] lib/regexec: Resolve unused variable Date: Fri, 18 Jun 2021 15:44:23 +0000 Message-Id: <3932753cd7929507688d341754fae944dac9a983.1624030621.git.darren.kenny@oracle.com> X-Mailer: git-send-email 2.18.4 In-Reply-To: References: Content-Type: text/plain X-Originating-IP: [141.143.213.44] X-ClientProxiedBy: BYAPR11CA0058.namprd11.prod.outlook.com (2603:10b6:a03:80::35) To PH0PR10MB4583.namprd10.prod.outlook.com (2603:10b6:510:43::6) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from darrenk-20201221-1634.osdevelopm1lhr.oraclevcn.com (141.143.213.44) by BYAPR11CA0058.namprd11.prod.outlook.com (2603:10b6:a03:80::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.21 via Frontend Transport; Fri, 18 Jun 2021 15:44:32 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0476a95e-16b1-4899-07c4-08d9326ff80d X-MS-TrafficTypeDiagnostic: PH0PR10MB4536: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kzgEaG4GQX6FZcg7W+t+vZd0ZD5XMG1Ou2s9axgNmFm2CQam8iAh+2MwJ9Qqy0Jyg0WiRgtoaA/At8eBsvHEslvgGOM2eHGY3dKTAAjpGe9+h4fh87/RyDhvgSs6g5M5CYMKg4p2ALqSLy9L4kJ+7cy5zvXiG/zgUiNVhf52i5/yFGsshZYT5D97WIYduKtN0HvUBZoKG58JzW7aacIM7ihTobBX8ttswDmLxZlWCOP1KZKb85m0Hy5c8ExubgaOKVeEvMl6VF5NP6m/c7Btb0etWbY+UyWzWSLZJgEL4j1A02bDM1ts+aDudHwn2ByIzt3Rg1e1OO3zOIpOfJIyy5onxrtxqX2+E0gviqIsdRDwIjDO4bBx9ug0zOTlJK2IcfiprlJHZ+GJ+/rq1pqL/5Zzcl9VpbFRAy1c8ZwG4D3Lhng+eizdvojREjOntQeQIBqX7QSEnas1+G3ubOJQZGwtE+uKkHbaxyElIWnkExynrgdGhinNP1y809ygLuqk8shndnu2rppNXu+FFdBWU8LpuD/JwWv2EXuJLpppyRy1SXpwexsXmT82npmy2jkzhVzMHHiN9/g9hqrODYF95BKdctNsU5Lb0yvmd/O9YvdHHM26WZxXFZACuoM+D2sNBWsuEqj9s24NrKadmKZtL+h5q7+CguZM//A6ae1zhss= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR10MB4583.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(136003)(396003)(39860400002)(346002)(366004)(376002)(26005)(38350700002)(478600001)(8676002)(956004)(6506007)(6486002)(36756003)(4326008)(38100700002)(44832011)(107886003)(316002)(16526019)(52116002)(2616005)(5660300002)(6512007)(8936002)(86362001)(2906002)(186003)(66476007)(66946007)(6916009)(66556008)(6666004); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?kga6D/QWktrC5SP77xHUiXYg2QgVZwN+BYfwgb5gBgx9rgKBFQCqsRVipc84?= =?us-ascii?Q?LCR0KuSL2ERsynL9rp7+ntR/0vuTSYJ/QijquybAPF1h4B56rp+cTv9XjkxD?= =?us-ascii?Q?R0pq6gUCiA3IgaVSpsAOR4W4caBHUEU6thdxZiE9zokxkUSNQoWzM4Q5ZapT?= =?us-ascii?Q?Z9hwo3i7WkBeoYqkU9eBWYGszU06Dn2L8xIQpFugdMsmRxBecAxGs6ZVORtN?= =?us-ascii?Q?fJlirzH+wEcWqZEUHaPm/tkASPw+NZi/jd1ojsfNUEJ1tbc8Awjntgb0ln71?= =?us-ascii?Q?ermcPGFmE5u0uyKhIw37xSHOARE9/l9riA9WWQH0F/+9wVGwxxjk5SicL3tR?= =?us-ascii?Q?VbJNVeAMzolwklGS43R21qAN3VBkZbqWUIgnmJer9bKLsXrADBXDLeyqb5qi?= =?us-ascii?Q?oLPXhZI3InHsaiw67PmAdnqdJcmg5htDhwYbj91+Aw6h6lhXQKKhCwbN6YlQ?= =?us-ascii?Q?mtKfL5EOBEhMJ/cSYhf0EhnLt3c9InYltWv7bqWfh7qrIc/arOVEpsavk+/v?= =?us-ascii?Q?RGdX9b5TeUE/Y5agQI2Klsub1tNCn29kcSdLPj66Gz2vm4vH4ciY44xtJR8K?= =?us-ascii?Q?kRxEu0pksj0ZGqxA1yfMtzR+Bq+MNcIwF1A84mx+Tvk+Qm4SkKBLshsJJccK?= =?us-ascii?Q?POP8c7/aRPDc1GU4N0NC0Ka2fY8yOASx1DRI/RlKMiu/NM4RKVRoyViIFcI6?= =?us-ascii?Q?avDXYH2y5YW24HElr70SMoYaYhCmxnKXMtebMg5Pl9DYSlRUponIxHn4RwaO?= =?us-ascii?Q?IhfxOT57wPAtk/Hw9aZNCcZiIsFlQxP2qymc5aKe5e8RZl7S2j2OvQKa4J2S?= =?us-ascii?Q?xJ1JMqrUgAh2PbWGMqo3V3R0IEh9OA/IYiy+kLQolPHKlsT6yuT80Txd5UVs?= =?us-ascii?Q?gEsaL6EeuqMZtcKamXSS7IrdFeXsC4UyWIaiNDJDY6Wo2HufDIo7G8Txz51g?= =?us-ascii?Q?3rmWu0hml1neftEa1yd0NJdf2i8tkw8Q1OmQqwac/Pg1HYZoCwvea7/KZJlv?= =?us-ascii?Q?DpcLLj6l259qfeU8EZiKl/jTzLV14GYbtrZHpTKrri/i4ZcDz2v0Dy2MvOob?= =?us-ascii?Q?kGebg6G4Yu8yvgSNZULSFLGJ3URPLl0ZEWgOEhMmvU/YoxibBnDfZExmjUND?= =?us-ascii?Q?RfLEVvZ+/bD9HDXqzRp/K1+ojP5H/9bd2ELbKFG5eVZonTA+/YDveDgZd965?= =?us-ascii?Q?Aw5psRmaHVDbX8tWDlCz/4/wUiOSDh/1ld+csLyLU8fzy2RxdVCxUFQccwI8?= =?us-ascii?Q?iJE6ZOb+XUDGoIMud6MM3GZHBkCH8vcdG7zPSNz978exnFBhQ+vlQBDKcnZX?= =?us-ascii?Q?30IIYjJGSHuBc6uihh5fUnvv?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0476a95e-16b1-4899-07c4-08d9326ff80d X-MS-Exchange-CrossTenant-AuthSource: PH0PR10MB4583.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jun 2021 15:44:33.5262 (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: t8bUOT0FkiqHi6pEO5vyI8qtfucA99gdf4QPHWvJW5YwSEhCnsyB6RLj5l8RzRClP3NEnh7c55tw89Ke727Yqg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB4536 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=10019 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 suspectscore=0 mlxlogscore=999 spamscore=0 adultscore=0 bulkscore=0 mlxscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2106180091 X-Proofpoint-GUID: PY1r4qlB4t9oRBFchQmjfuubuZoHV1oX X-Proofpoint-ORIG-GUID: PY1r4qlB4t9oRBFchQmjfuubuZoHV1oX Received-SPF: pass client-ip=205.220.177.32; envelope-from=darren.kenny@oracle.com; helo=mx0b-00069f02.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Fri, 18 Jun 2021 12:01:41 -0400 X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Gnulib discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: darren.kenny@oracle.com Errors-To: bug-gnulib-bounces+normalperson=yhbt.net@gnu.org Sender: "bug-gnulib" This is a fairly minor issue where a variable is being assigned to but not checked before it is overwritten again. The reason for this issue is that we are not building with DEBUG set and this in turn means that the assert() that reads the value of the variable match_last is being processed out. The solution, move the assignment to match_last in to an ifdef DEBUG too. This was originally found during a Coverity scan of GRUB2. Signed-off-by: Darren Kenny --- lib/regexec.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/regexec.c b/lib/regexec.c index 2b2ab8e4afd0..ed3fa43bd0d1 100644 --- a/lib/regexec.c +++ b/lib/regexec.c @@ -816,7 +816,11 @@ re_search_internal (const regex_t *preg, const char *string, Idx length, break; if (__glibc_unlikely (err != REG_NOMATCH)) goto free_return; +#ifdef DEBUG + /* Only used for assertion below when DEBUG is set, otherwise + it will be over-written when we loop around. */ match_last = -1; +#endif } else break; /* We found a match. */ -- 2.18.4