From 6e7695c994aa45c0f7e9f8b80aa6f99717bbaf60 Mon Sep 17 00:00:00 2001
From: "Arnold D. Robbins" <arnold@skeeve.com>
Date: Wed, 15 Apr 2026 09:39:02 +0300
Subject: [PATCH] Avoid buffer overflow in extension/readdir.c.

CVE: CVE-2026-40553
Upstream-Status: Backport [https://cgit.git.savannah.gnu.org/cgit/gawk.git/commit/?id=cca0366144336b49aaa7d5d949966ce8e2c70843]

(cherry picked from commit cca0366144336b49aaa7d5d949966ce8e2c70843)
Signed-off-by: Darsh Kelaiya <dkelaiya@cisco.com>
---
 extension/ChangeLog | 6 ++++++
 extension/readdir.c | 6 +++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/extension/ChangeLog b/extension/ChangeLog
index b11e83ac..6f88eb19 100644
--- a/extension/ChangeLog
+++ b/extension/ChangeLog
@@ -1,3 +1,9 @@
+2026-04-15         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* readdir.c (ftype): Use snprintf() to check for buffer
+	overflow in the file name before calling stat(). Thanks to
+	Marcin Wyczechowski <mwyczechowski@afine.com> for the report.
+
 2026-02-22         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* 5.4.0: Release tar ball made.
diff --git a/extension/readdir.c b/extension/readdir.c
index f876e168..5bbee261 100644
--- a/extension/readdir.c
+++ b/extension/readdir.c
@@ -118,8 +118,12 @@ ftype(struct dirent *entry, const char *dirname)
 #endif
 	char fname[PATH_MAX];
 	struct stat sbuf;
+	int count;
+
+	count = snprintf(fname, sizeof(fname), "%s/%s", dirname, entry->d_name);
+	if (count > sizeof(fname))
+		return "u";	// buffer overflow. skip stat() call.
 
-	sprintf(fname, "%s/%s", dirname, entry->d_name);
 	if (stat(fname, &sbuf) == 0) {
 		if (S_ISBLK(sbuf.st_mode))
 			return "b";
-- 
2.53.0

