Blame SOURCES/0058-Fix-os.date-for-wider-libc-strftime-compatibility.patch
|
 |
006bc1 |
From fc63c938b522e147ea728b75f385728bf4a8fc35 Mon Sep 17 00:00:00 2001
|
|
|
006bc1 |
From: Mike Pall <mike>
|
|
|
006bc1 |
Date: Thu, 10 Jan 2019 12:47:28 +0100
|
|
|
006bc1 |
Subject: [PATCH 58/72] Fix os.date() for wider libc strftime() compatibility.
|
|
|
006bc1 |
|
|
|
006bc1 |
Thanks to Jesper Lundgren.
|
|
|
006bc1 |
---
|
|
|
006bc1 |
src/lib_os.c | 4 ++--
|
|
|
006bc1 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
006bc1 |
|
|
|
006bc1 |
diff --git a/src/lib_os.c b/src/lib_os.c
|
|
|
006bc1 |
index 9e78d49..ffbc3fd 100644
|
|
|
006bc1 |
--- a/src/lib_os.c
|
|
|
006bc1 |
+++ b/src/lib_os.c
|
|
|
006bc1 |
@@ -205,12 +205,12 @@ LJLIB_CF(os_date)
|
|
|
006bc1 |
setboolfield(L, "isdst", stm->tm_isdst);
|
|
|
006bc1 |
} else if (*s) {
|
|
|
006bc1 |
SBuf *sb = &G(L)->tmpbuf;
|
|
|
006bc1 |
- MSize sz = 0;
|
|
|
006bc1 |
+ MSize sz = 0, retry = 4;
|
|
|
006bc1 |
const char *q;
|
|
|
006bc1 |
for (q = s; *q; q++)
|
|
|
006bc1 |
sz += (*q == '%') ? 30 : 1; /* Overflow doesn't matter. */
|
|
|
006bc1 |
setsbufL(sb, L);
|
|
|
006bc1 |
- for (;;) {
|
|
|
006bc1 |
+ while (retry--) { /* Limit growth for invalid format or empty result. */
|
|
|
006bc1 |
char *buf = lj_buf_need(sb, sz);
|
|
|
006bc1 |
size_t len = strftime(buf, sbufsz(sb), s, stm);
|
|
|
006bc1 |
if (len) {
|
|
|
006bc1 |
--
|
|
|
006bc1 |
2.20.1
|
|
|
006bc1 |
|