From 38b4813f4821d19e10d512be9c8a75d053d791c3 Mon Sep 17 00:00:00 2001
From: nicm <nicm@openbsd.org>
Date: Mon, 5 Oct 2026 10:59:37 +0000
Subject: [PATCH] Check format time in format_skip1 before the loop as well.

---
 format.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/format.c b/format.c
index 5a9a86a05..4c4ede394 100644
--- a/format.c
+++ b/format.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: format.c,v 1.424 2026/09/29 14:12:21 nicm Exp $ */
+/* $OpenBSD: format.c,v 1.425 2026/10/05 10:59:37 nicm Exp $ */
 
 /*
  * Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -4813,6 +4813,9 @@ format_skip1(struct format_expand_state *es, const char *s, const char *end)
 	int	brackets = 0;
 	u_int	check = 0;
 
+	if (es != NULL && !format_check_time(es, NULL))
+		return (NULL);
+
 	for (; *s != '\0'; s++) {
 		if (es != NULL && !format_check_time(es, &check))
 			return (NULL);