Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-12 23:55:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CRT]

Browse source 
- Gracefully fail on NULL for gmtime functions. Fixes msvcrt:time crash

svn path=/trunk/; revision=54298
This commit is contained in:
Thomas Faber 2011-11-05 10:24:24 +00:00
parent 48680406d2
commit e325aa3a89
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
reactos/lib/sdk/crt/time/gmtime.c
View file

@ -105,20 +105,19 @@ _gmtime64(const __time64_t * ptime)
{
PTHREADDATA pThreadData;
struct tm *ptm;
__time64_t time = *ptime;
/* Validate parameters */
if (time < 0)
if (!ptime || *ptime < 0)
{
return 0;
return NULL;
}
/* Get pointer to TLS tm buffer */
pThreadData = GetThreadData();
ptm = &pThreadData->tmbuf;
/* Use _gmtime_worker to do the ral work */
return _gmtime_worker(ptm, time, 0);
/* Use _gmtime_worker to do the real work */
return _gmtime_worker(ptm, *ptime, 0);
}
/******************************************************************************
@ -129,7 +128,11 @@ _gmtime64(const __time64_t * ptime)
struct tm *
_gmtime32(const __time32_t * ptime)
{
__time64_t time64 = (__time64_t)*ptime;
__time64_t time64;
if (!ptime)
return NULL;
time64 = *ptime;
return _gmtime64(&time64);
}
@ -141,6 +144,10 @@ _gmtime32(const __time32_t * ptime)
struct tm *
gmtime(const time_t * ptime)
{
__time64_t time64 = (__time64_t)*ptime;
__time64_t time64;
if (!ptime)
return NULL;
time64 = *ptime;
return _gmtime64(&time64);
}