generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

parsedate.c: fix a numeric overflow

Browse Source
This commit is contained in:
Yang Tse 2012-03-22 15:53:03 +01:00
parent 97b66ebefe
commit e8a32438c2
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/parsedate.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -75,6 +75,10 @@
#include "setup.h" #include "setup.h"
#ifdef HAVE_LIMITS_H
#include <limits.h>
#endif
#include <curl/curl.h> #include <curl/curl.h>
#include "rawstr.h" #include "rawstr.h"
#include "warnless.h" #include "warnless.h"
@ -392,7 +396,24 @@ static int parsedate(const char *date, time_t *output)
secnum = 0; secnum = 0;
} }
else { else {
val = curlx_sltosi(strtol(date, &end, 10)); long lval;
int error;
int old_errno;
old_errno = ERRNO;
SET_ERRNO(0);
lval = strtol(date, &end, 10);
error = ERRNO;
if(error != old_errno)
SET_ERRNO(old_errno);
if(error)
return PARSEDATE_FAIL;
if((lval > (long)INT_MAX) || (lval < (long)INT_MIN))
return PARSEDATE_FAIL;
val = curlx_sltosi(lval);
if((tzoff == -1) && if((tzoff == -1) &&
((end - date) == 4) && ((end - date) == 4) &&