hyung-hwan/qse
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

enhanced qse_addtime() and qse_subtime() to detect overflow/underflow

Browse Source 
changed qse_mbsntonwad()/qse_wcsntonwad() to accept a unix path beginning with a slash.
changed the nwad to string conversion function to not append @ if a unix socket address begins with a slash
This commit is contained in:
hyung-hwan
2020-09-02 20:34:11 +00:00
parent db0457fe73
commit c24d198cbf
6 changed files with 133 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
qse/lib/cmn/time.c
View File

@ -619,14 +619,64 @@ void qse_addtime (const qse_ntime_t* x, const qse_ntime_t* y, qse_ntime_t* z)
QSE_ASSERT (x->nsec >= 0 && x->nsec < QSE_NSECS_PER_SEC);
QSE_ASSERT (y->nsec >= 0 && y->nsec < QSE_NSECS_PER_SEC);
#if 0
z->sec = x->sec + y->sec;
z->nsec = x->nsec + y->nsec;
if (z->nsec >= QSE_NSECS_PER_SEC)
while (z->nsec >= QSE_NSECS_PER_SEC)
{
z->sec = z->sec + 1;
z->nsec = z->nsec - QSE_NSECS_PER_SEC;
}
#else
qse_ntime_sec_t xs, ys;
qse_ntime_nsec_t ns;
ns = x->nsec + y->nsec;
if (ns >= QSE_NSECS_PER_SEC)
{
ns = ns - QSE_NSECS_PER_SEC;
if (x->sec == QSE_TYPE_MAX(qse_ntime_sec_t))
{
if (y->sec >= 0) goto overflow;
xs = x->sec;
ys = y->sec + 1; /* this won't overflow */
}
else
{
xs = x->sec + 1; /* this won't overflow */
ys = y->sec;
}
}
else
{
xs = x->sec;
ys = y->sec;
}
if ((ys >= 1 && xs > QSE_TYPE_MAX(qse_ntime_sec_t) - ys) ||
(ys <= -1 && xs < QSE_TYPE_MIN(qse_ntime_sec_t) - ys))
{
if (xs >= 0)
{
overflow:
xs = QSE_TYPE_MAX(qse_ntime_sec_t);
ns = QSE_NSECS_PER_SEC - 1;
}
else
{
xs = QSE_TYPE_MIN(qse_ntime_sec_t);
ns = 0;
}
}
else
{
xs = xs + ys;
}
z->sec = xs;
z->nsec = ns;
#endif
}
void qse_subtime (const qse_ntime_t* x, const qse_ntime_t* y, qse_ntime_t* z)
@ -634,18 +684,66 @@ void qse_subtime (const qse_ntime_t* x, const qse_ntime_t* y, qse_ntime_t* z)
QSE_ASSERT (x->nsec >= 0 && x->nsec < QSE_NSECS_PER_SEC);
QSE_ASSERT (y->nsec >= 0 && y->nsec < QSE_NSECS_PER_SEC);
#if 0
z->sec = x->sec - y->sec;
z->nsec = x->nsec - y->nsec;
if (z->nsec < 0)
while (z->nsec < 0)
{
z->sec = z->sec - 1;
z->nsec = z->nsec + QSE_NSECS_PER_SEC;
}
#else
qse_ntime_sec_t xs, ys;
qse_ntime_nsec_t ns;
ns = x->nsec - y->nsec;
if (ns < 0)
{
ns = ns + QSE_NSECS_PER_SEC;
if (x->sec == QSE_TYPE_MIN(qse_ntime_sec_t))
{
if (y->sec <= 0) goto underflow;
xs = x->sec;
ys = y->sec - 1; /* this won't underflow */
}
else
{
xs = x->sec - 1; /* this won't underflow */
ys = y->sec;
}
}
else
{
xs = x->sec;
ys = y->sec;
}
if ((ys >= 1 && xs < QSE_TYPE_MIN(qse_ntime_sec_t) + ys) ||
(ys <= -1 && xs > QSE_TYPE_MAX(qse_ntime_sec_t) + ys))
{
if (xs >= 0)
{
xs = QSE_TYPE_MAX(qse_ntime_sec_t);
ns = QSE_NSECS_PER_SEC - 1;
}
else
{
underflow:
xs = QSE_TYPE_MIN(qse_ntime_sec_t);
ns = 0;
}
}
else
{
xs = xs - ys;
}
z->sec = xs;
z->nsec = ns;
#endif
}
int qse_mbs_to_ntime (const qse_mchar_t* text, qse_ntime_t* ntime)
{
const qse_mchar_t* p = text, * cp;