[前][次][番号順一覧][スレッド一覧]

ruby-changes:22389

From: usa <ko1@a...>
Date: Mon, 6 Feb 2012 16:39:50 +0900 (JST)
Subject: [ruby-changes:22389] usa:r34438 (ruby_1_9_3): merge rivision(s) 33685:

usa	2012-02-06 16:39:40 +0900 (Mon, 06 Feb 2012)

  New Revision: 34438

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34438

  Log:
    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]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/version.h
    branches/ruby_1_9_3/win32/win32.c

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34437)
+++ ruby_1_9_3/ChangeLog	(revision 34438)
@@ -1,3 +1,9 @@
+Mon Feb  6 16:38:56 2012  NAKAMURA Usaku  <usa@r...>
+
+	* 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@r...>
 
 	* io.c (rb_update_max_fd): fstat(2) can fail with other than
Index: ruby_1_9_3/win32/win32.c
===================================================================
--- ruby_1_9_3/win32/win32.c	(revision 34437)
+++ ruby_1_9_3/win32/win32.c	(revision 34438)
@@ -5460,6 +5460,9 @@
     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;
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34437)
+++ ruby_1_9_3/version.h	(revision 34438)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 35
+#define RUBY_PATCHLEVEL 36
 
 #define RUBY_RELEASE_DATE "2012-02-06"
 #define RUBY_RELEASE_YEAR 2012

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]