Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

indent: fix out-of-bounds read when reducing a statement 

Since parse.c 1.73 from today. The parser symbol psym_stmt_list that was
removed in that commit acted as a stop symbol, so that psyms_reduce_stmt
would save a memory access.
This commit is contained in:
rillig 2023-06-14 17:52:45 +00:00
parent ca9074275c
commit 856f35def8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.bin/indent/parse.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: parse.c,v 1.74 2023/06/14 16:14:30 rillig Exp $ */
/* $NetBSD: parse.c,v 1.75 2023/06/14 17:52:45 rillig Exp $ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
__RCSID("$NetBSD: parse.c,v 1.74 2023/06/14 16:14:30 rillig Exp $");
__RCSID("$NetBSD: parse.c,v 1.75 2023/06/14 17:52:45 rillig Exp $");
#include <err.h>
@ -116,7 +116,7 @@ static void
psyms_reduce(struct psym_stack *psyms)
{
again:
if (psyms->sym[psyms->len - 1] == psym_stmt
if (psyms->len >= 2 && psyms->sym[psyms->len - 1] == psym_stmt
&& psyms_reduce_stmt(psyms))
goto again;
if (psyms->sym[psyms->len - 1] == psym_while_expr &&