diff options
| author | Remi Collet <remi@php.net> | 2014-10-28 08:51:22 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2014-10-28 08:51:22 +0100 |
| commit | 2bec5d18b7a99c9cd360719da9d0d3207ef8be14 (patch) | |
| tree | 991543fc4dd134c8bdddc39d1851a051aab78860 /ext/xmlrpc | |
| parent | 6457c34ad8adec41457ff09d2d8c00792f66c964 (diff) | |
| parent | 47acdcb1763c0fbf5f6fd9e9211f27929e5e4366 (diff) | |
| download | php-git-2bec5d18b7a99c9cd360719da9d0d3207ef8be14.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Ensure we have enough input data before parsing date
Diffstat (limited to 'ext/xmlrpc')
| -rw-r--r-- | ext/xmlrpc/libxmlrpc/xmlrpc.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ext/xmlrpc/libxmlrpc/xmlrpc.c b/ext/xmlrpc/libxmlrpc/xmlrpc.c index fed73bbfa8..a97b09b303 100644 --- a/ext/xmlrpc/libxmlrpc/xmlrpc.c +++ b/ext/xmlrpc/libxmlrpc/xmlrpc.c @@ -201,9 +201,13 @@ static int date_from_ISO8601 (const char *text, time_t * value) { } p++; } - text = buf; + *p2 = 0; + text = buf; } + if (strlen(text)<17) { + return -1; + } tm.tm_isdst = -1; |