archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-18 18:13:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

merge rivision(s) 33685:

Browse source 
* 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
This commit is contained in:
usa 2012-02-06 07:39:40 +00:00
parent 25f531a924
commit ad837e5a12
3 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Mon Feb 6 16:38:56 2012 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c (unixtime_to_filetime): should check the return value
of localtime(). reported by snowjail at gmail.com.
[ruby-dev:44838] [Bug #5596]
Mon Feb 6 16:36:25 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> Mon Feb 6 16:36:25 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (rb_update_max_fd): fstat(2) can fail with other than * io.c (rb_update_max_fd): fstat(2) can fail with other than

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3" #define RUBY_VERSION "1.9.3"
#define RUBY_PATCHLEVEL 35 #define RUBY_PATCHLEVEL 36
#define RUBY_RELEASE_DATE "2012-02-06" #define RUBY_RELEASE_DATE "2012-02-06"
#define RUBY_RELEASE_YEAR 2012 #define RUBY_RELEASE_YEAR 2012

3
win32/win32.c
View file

@ -5460,6 +5460,9 @@ unixtime_to_filetime(time_t time, FILETIME *ft)
FILETIME lt; FILETIME lt;
tm = localtime(&time); tm = localtime(&time);
if (!tm) {
return -1;
}
st.wYear = tm->tm_year + 1900; st.wYear = tm->tm_year + 1900;
st.wMonth = tm->tm_mon + 1; st.wMonth = tm->tm_mon + 1;
st.wDayOfWeek = tm->tm_wday; st.wDayOfWeek = tm->tm_wday;