GitLab/ocserv
1
0
Fork 0
mirror of https://gitlab.com/openconnect/ocserv.git synced 2026-02-10 08:46:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

updated to libopts 5.18.4

Browse Source
This commit is contained in:
Nikos Mavrogiannopoulos
2014-10-04 10:00:39 +02:00
parent 442ea48f2b
commit c2640d0076
21 changed files with 543 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libopts/parse-duration.c
View File

@@ -27,6 +27,8 @@
#include <stdlib.h>
#include <string.h>
#include "intprops.h"
#ifndef NUL
#define NUL '\0'
#endif
@@ -51,7 +53,8 @@ typedef enum {
#define SEC_PER_MONTH (SEC_PER_DAY * 30)
#define SEC_PER_YEAR (SEC_PER_DAY * 365)
#define TIME_MAX 0x7FFFFFFF
#undef MAX_DURATION
#define MAX_DURATION TYPE_MAXIMUM(time_t)
/* Wrapper around strtoul that does not require a cast. */
static unsigned long
@@ -80,14 +83,14 @@ scale_n_add (time_t base, time_t val, int scale)
return BAD_TIME;
}
if (val > TIME_MAX / scale)
if (val > MAX_DURATION / scale)
{
errno = ERANGE;
return BAD_TIME;
}
val *= scale;
if (base > TIME_MAX - val)
if (base > MAX_DURATION - val)
{
errno = ERANGE;
return BAD_TIME;