admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

time.c: fixed time_zonename buffer size bug.

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2021-07-25 16:38:37 +09:00
parent 368b75d81b
commit c2c0250063
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-time/src/time.c
+3 -3
View File
@@ -687,7 +687,7 @@ mrb_time_year(mrb_state *mrb, mrb_value self)
static size_t
time_zonename(mrb_state *mrb, struct mrb_time *tm, char *buf, size_t len)
{
#if 1 || defined(_MSC_VER) && _MSC_VER < 1900 || defined(__MINGW64__) || defined(__MINGW32__)
#if defined(_MSC_VER) && _MSC_VER < 1900 || defined(__MINGW64__) || defined(__MINGW32__)
struct tm datetime = {0};
time_t utc_sec = timegm(&tm->datetime);
int offset = abs((int)(utc_sec - tm->sec) / 60);
@@ -695,9 +695,9 @@ time_zonename(mrb_state *mrb, struct mrb_time *tm, char *buf, size_t len)
datetime.tm_hour = offset / 60;
datetime.tm_min = offset % 60;
buf[0] = utc_sec < tm->sec ? '-' : '+';
return strftime(buf+1, sizeof(buf)-1, "%H%M", &datetime) + 1;
return strftime(buf+1, len, "%H%M", &datetime) + 1;
#else
return strftime(buf, sizeof(buf), "%z", &tm->datetime);
return strftime(buf, len, "%z", &tm->datetime);
#endif
}