diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-07-27 21:51:55 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-07-28 00:34:27 -0700 |
| commit | 531be9662f47be89b3ecf9eddc520a5750c4e2a9 (patch) | |
| tree | 859d22e38fb2d2b69a98a0bc5c277f936ec3cac4 /ext/session/session.c | |
| parent | fedc7993445f98f923bc8838032fe81a225eea2e (diff) | |
| parent | b4a4db467b6a1e90131705832f1a3613a60c4259 (diff) | |
| download | php-git-531be9662f47be89b3ecf9eddc520a5750c4e2a9.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
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 eb14e07b65..ce01b2c335 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); } |