aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Pall <mike>2013-04-24 11:22:52 +0200
committerMike Pall <mike>2013-04-24 11:24:34 +0200
commit7c2844873070f71e2e98765682326e6d98a6b55e (patch)
tree86fee3a47e7b1e06a3f63c429af79959b28350ea
parent39e53e8c4c4b6151c53e384d411ae48026e5567d (diff)
downloadluajit-7c2844873070f71e2e98765682326e6d98a6b55e.tar.gz
luajit-7c2844873070f71e2e98765682326e6d98a6b55e.tar.bz2
luajit-7c2844873070f71e2e98765682326e6d98a6b55e.zip
Fix os.date() broken by d38d10a3.
-rw-r--r--src/lib_os.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib_os.c b/src/lib_os.c
index d0291f52..08f538bd 100644
--- a/src/lib_os.c
+++ b/src/lib_os.c
@@ -187,7 +187,7 @@ LJLIB_CF(os_date)
187#endif 187#endif
188 } 188 }
189 if (stm == NULL) { /* Invalid date? */ 189 if (stm == NULL) { /* Invalid date? */
190 setnilV(L->top-1); 190 setnilV(L->top++);
191 } else if (strcmp(s, "*t") == 0) { 191 } else if (strcmp(s, "*t") == 0) {
192 lua_createtable(L, 0, 9); /* 9 = number of fields */ 192 lua_createtable(L, 0, 9); /* 9 = number of fields */
193 setfield(L, "sec", stm->tm_sec); 193 setfield(L, "sec", stm->tm_sec);
@@ -210,14 +210,14 @@ LJLIB_CF(os_date)
210 char *buf = lj_buf_need(sb, sz); 210 char *buf = lj_buf_need(sb, sz);
211 size_t len = strftime(buf, sbufsz(sb), s, stm); 211 size_t len = strftime(buf, sbufsz(sb), s, stm);
212 if (len) { 212 if (len) {
213 setstrV(L, L->top-1, lj_str_new(L, buf, len)); 213 setstrV(L, L->top++, lj_str_new(L, buf, len));
214 lj_gc_check(L); 214 lj_gc_check(L);
215 break; 215 break;
216 } 216 }
217 sz += (sz|1); 217 sz += (sz|1);
218 } 218 }
219 } else { 219 } else {
220 setstrV(L, L->top-1, &G(L)->strempty); 220 setstrV(L, L->top++, &G(L)->strempty);
221 } 221 }
222 return 1; 222 return 1;
223} 223}