diff options
| author | Anatol Belski <ab@php.net> | 2016-08-17 13:23:31 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-08-17 13:23:31 +0200 |
| commit | f7231acadfe79f5d42ffd26671451610ee1e1c07 (patch) | |
| tree | a4c75a09b31b5d8676f045d89afea17cd729e6bb | |
| parent | f7d4733b2eb199a672d1853deafbf5f57c733575 (diff) | |
| parent | 06c0540b901baf2fcfea2256f3d83c5907aab703 (diff) | |
| download | php-git-f7231acadfe79f5d42ffd26671451610ee1e1c07.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix char * vs zend_string *
| -rw-r--r-- | ext/wddx/wddx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c index 3780270769..cf890a9ca5 100644 --- a/ext/wddx/wddx.c +++ b/ext/wddx/wddx.c @@ -1044,7 +1044,7 @@ static void php_wddx_process_data(void *user_data, const XML_Char *s, int len) str = zend_string_init((char *)s, len, 0); } - ZVAL_LONG(&ent->data, php_parse_date(str, NULL)); + ZVAL_LONG(&ent->data, php_parse_date(ZSTR_VAL(str), NULL)); /* date out of range < 1969 or > 2038 */ if (Z_LVAL(ent->data) == -1) { ZVAL_STR_COPY(&ent->data, str); |