cpp/openttd-patchpack/source Changeset - r26336:7c7912ebd301

Changeset - r26336:7c7912ebd301

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

glx22 - 22 months ago 2022-08-23 14:50:59
glx@openttd.org

Fix #9974, aa5a8fe: strftime buffer maxsize is off by one

strftime() return value doesn't count NULL character, but buffer size must include it.

1 file changed with 1 insertions and 1 deletions:

src/walltime_func.h

0 comments (0 inline, 0 general)

src/walltime_func.h

➞

Show inline comments

@@ @@ -62,13 +62,13 @@ struct Time { @@
 		/* GCC bug #39438; unlike for printf where the appropriate attribute prevent the
 		 * "format non literal" warning, that does not happen for strftime. Even though
 		 * format warnings will be created for invalid strftime formats. */
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wformat-nonliteral"
 #endif /* _MSC_VER */
 		return strftime(buffer, last - buffer, format, &time_struct);
+		return strftime(buffer, last - buffer + 1, format, &time_struct);
 #ifndef _MSC_VER
 #pragma GCC diagnostic pop
 #endif /* _MSC_VER */
+	}
 };

0 comments (0 inline, 0 general)