diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-07-28 00:37:32 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-07-28 00:37:32 -0700 |
| commit | c41ca948248219e0c098ece6805726e0f59be54f (patch) | |
| tree | 7ef85a67beba4de7f9e1c7da6ca52e2d3deac3a3 /ext/session/session.c | |
| parent | 90a0d58af81b03dfc8c1b0be4efa71cffc732aef (diff) | |
| parent | 531be9662f47be89b3ecf9eddc520a5750c4e2a9 (diff) | |
| download | php-git-c41ca948248219e0c098ece6805726e0f59be54f.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix missing type checks in various functions
Conflicts:
ext/openssl/openssl.c
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 6412043673..d1a7a073a5 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -301,7 +301,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); } |