summaryrefslogtreecommitdiff
path: root/time.c
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-01-06 12:41:20 (GMT)
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-01-06 12:41:20 (GMT)
commit9bbe6b9d0ce6f3228b082aba3f70cdefd3415a22 (patch)
treed07276c95c318147da10836a1eb8062a7c870dcb /time.c
parentc0ee6f2af98a8322e842bb2847492bfc56cb21b9 (diff)
* time.c (timelocalw): Set tm_isdst field -1 if vtm->isdst is
VTM_ISDST_INITVAL. This bug is introduced at packing struct vtm (r45155). [ruby-core:67345] [Bug #10698] Reported by Boris Ruf. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49162 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'time.c')
-rw-r--r--time.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/time.c b/time.c
index ddd27ca..044a049 100644
--- a/time.c
+++ b/time.c
@@ -1548,7 +1548,7 @@ timelocalw(struct vtm *vtm)
tm.tm_hour = vtm->hour;
tm.tm_min = vtm->min;
tm.tm_sec = vtm->sec;
- tm.tm_isdst = vtm->isdst;
+ tm.tm_isdst = vtm->isdst == VTM_ISDST_INITVAL ? -1 : vtm->isdst;
if (find_time_t(&tm, 0, &t))
goto no_localtime;