Module Name:    src
Committed By:   rillig
Date:           Sat Oct 30 11:10:36 UTC 2021

Modified Files:
        src/usr.bin/indent: indent.c

Log Message:
indent: don't risk a buffer overflow in code_add_decl_indent

The buffers have a safety margin of 5 characters, so the bounds check is
not strictly necessary. It makes the code more uniform though.

No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.184 -r1.185 src/usr.bin/indent/indent.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/indent/indent.c
diff -u src/usr.bin/indent/indent.c:1.184 src/usr.bin/indent/indent.c:1.185
--- src/usr.bin/indent/indent.c:1.184	Sat Oct 30 11:05:26 2021
+++ src/usr.bin/indent/indent.c	Sat Oct 30 11:10:36 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: indent.c,v 1.184 2021/10/30 11:05:26 rillig Exp $	*/
+/*	$NetBSD: indent.c,v 1.185 2021/10/30 11:10:36 rillig Exp $	*/
 
 /*-
  * SPDX-License-Identifier: BSD-4-Clause
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)indent.c	5.1
 
 #include <sys/cdefs.h>
 #if defined(__NetBSD__)
-__RCSID("$NetBSD: indent.c,v 1.184 2021/10/30 11:05:26 rillig Exp $");
+__RCSID("$NetBSD: indent.c,v 1.185 2021/10/30 11:10:36 rillig Exp $");
 #elif defined(__FreeBSD__)
 __FBSDID("$FreeBSD: head/usr.bin/indent/indent.c 340138 2018-11-04 19:24:49Z oshogbo $");
 #endif
@@ -616,7 +616,7 @@ code_add_decl_indent(int decl_ind, bool 
 	buf_add_char(&code, ' ');
 
     if (code.e == orig_code_e && ps.want_blank) {
-	*code.e++ = ' ';
+	buf_add_char(&code, ' ');
 	ps.want_blank = false;
     }
 }

Reply via email to