Merge branch 'obsd-master'

2025-01-08 08:58:47 +00:00 · 2023-07-03 14:01:10 +01:00 · 2023-07-03 14:01:10 +01:00 · f9b0460840
commit f9b0460840
parent 659d876cd5 ac43186dff
1 changed files with 3 additions and 1 deletions
--- a/format.c
+++ b/format.c
@ -3664,7 +3664,9 @@ format_skip(const char *s, const char *end)
 	for (; *s != '\0'; s++) {
 		if (*s == '#' && s[1] == '{')
 			brackets++;
-		if (*s == '#' && strchr(",#{}:", s[1]) != NULL) {
+		if (*s == '#' &&
+		    s[1] != '\0' &&
+		    strchr(",#{}:", s[1]) != NULL) {
 			s++;
 			continue;
 		}