diff options
| author | Remi Collet <remi@php.net> | 2014-10-28 08:50:48 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2014-10-28 08:50:48 +0100 |
| commit | 47acdcb1763c0fbf5f6fd9e9211f27929e5e4366 (patch) | |
| tree | 0c37a72336153e9f309c3ac4842673ff9ec92573 | |
| parent | c5659cb8bd53ac2fd9952ca7c5445bda8dcaea24 (diff) | |
| parent | 13a218d3285f78812bb8a1d2214b9d6e166924b8 (diff) | |
| download | php-git-47acdcb1763c0fbf5f6fd9e9211f27929e5e4366.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Ensure we have enough input data before parsing date
| -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 b766a5495a..f184cf49ee 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; |