i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* fix oversight that gmtime() and localtime() may return NULL, which would lead

Browse Source 
to a crash


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38143 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Oliver Tappe
2010-08-16 14:52:37 +00:00
parent 306fdb5b98
commit 559cf371bc
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/support/DateTime.cpp
+7 -1
View File
@@ -157,6 +157,9 @@ BTime::CurrentTime(time_type type)
else else
timeinfo = localtime_r(&tv.tv_sec, &result); timeinfo = localtime_r(&tv.tv_sec, &result);
if (timeinfo == NULL)
return BTime();
int32 sec = timeinfo->tm_sec; int32 sec = timeinfo->tm_sec;
return BTime(timeinfo->tm_hour, timeinfo->tm_min, (sec > 59) ? 59 : sec, return BTime(timeinfo->tm_hour, timeinfo->tm_min, (sec > 59) ? 59 : sec,
tv.tv_usec); tv.tv_usec);
@@ -594,6 +597,9 @@ BDate::CurrentDate(time_type type)
else else
timeinfo = localtime_r(&timer, &result); timeinfo = localtime_r(&timer, &result);
if (timeinfo == NULL)
return BDate();
return BDate(timeinfo->tm_year + 1900, timeinfo->tm_mon +1, timeinfo->tm_mday); return BDate(timeinfo->tm_year + 1900, timeinfo->tm_mon +1, timeinfo->tm_mday);
} }
@@ -1385,7 +1391,7 @@ BDateTime::SetTime_t(uint32 seconds)
BTime time; BTime time;
time.AddSeconds(seconds % kSecondsPerDay); time.AddSeconds(seconds % kSecondsPerDay);
fTime.SetTime(time); fTime.SetTime(time);
BDate date(1970, 1, 1); BDate date(1970, 1, 1);
date.AddDays(seconds / kSecondsPerDay); date.AddDays(seconds / kSecondsPerDay);
fDate.SetDate(date); fDate.SetDate(date);