diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-07-28 00:39:24 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-07-28 00:39:24 -0700 |
| commit | f281a315f7acaefba0dc1699bf15c009b6d8a0ae (patch) | |
| tree | 3bd92d1c15f968c9d910644bd2cb06d76e1de756 /ext/session/session.c | |
| parent | 47a12117c39bc2f5e836ef79e69e9f191e2e8363 (diff) | |
| parent | 7f865ffdd89c03a7dc5d2d4490b65b1b60ef4a31 (diff) | |
| download | php-git-f281a315f7acaefba0dc1699bf15c009b6d8a0ae.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
fix NEWS
Fix missing type checks in various functions
Diffstat (limited to 'ext/session/session.c')
| -rw-r--r-- | ext/session/session.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/session/session.c b/ext/session/session.c index b24e6365f1..5b82ae7ffe 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -302,7 +302,8 @@ PHPAPI char *php_session_create_id(PS_CREATE_SID_ARGS) /* {{{ */ if (zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void **) &array) == SUCCESS && Z_TYPE_PP(array) == IS_ARRAY && - zend_hash_find(Z_ARRVAL_PP(array), "REMOTE_ADDR", sizeof("REMOTE_ADDR"), (void **) &token) == SUCCESS + zend_hash_find(Z_ARRVAL_PP(array), "REMOTE_ADDR", sizeof("REMOTE_ADDR"), (void **) &token) == SUCCESS && + Z_TYPE_PP(token) == IS_STRING ) { remote_addr = Z_STRVAL_PP(token); } |