diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-06 07:39:40 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-06 07:39:40 +0000 |
| commit | ad837e5a1286ea79e563d3fb928695b171badb83 (patch) | |
| tree | 3a74bbb73bf9a82089962b38d000b8e6e4698867 /win32 | |
| parent | 25f531a9247e24d4d5e50d8e9da0feb6e6c3ef4b (diff) | |
merge rivision(s) 33685:
* win32/win32.c (unixtime_to_filetime): should check the return value
of localtime(). reported by snowjail at gmail.com.
[ruby-dev:44838] [Bug #5596]
[Backport #5596]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34438 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/win32.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/win32/win32.c b/win32/win32.c index 759762b89a..977628126a 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -5460,6 +5460,9 @@ unixtime_to_filetime(time_t time, FILETIME *ft) FILETIME lt; tm = localtime(&time); + if (!tm) { + return -1; + } st.wYear = tm->tm_year + 1900; st.wMonth = tm->tm_mon + 1; st.wDayOfWeek = tm->tm_wday; |