summaryrefslogtreecommitdiff
path: root/ext/session
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2014-07-27 02:40:27 -0700
committerStanislav Malyshev <stas@php.net>2014-07-27 02:42:49 -0700
commitb4a4db467b6a1e90131705832f1a3613a60c4259 (patch)
tree3f5ca171a79418ba3eb7251f0ecd4001aaed7d40 /ext/session
parentd0a244f1f3705adb4c51707802f84a95ceadc137 (diff)
downloadphp-git-b4a4db467b6a1e90131705832f1a3613a60c4259.tar.gz
Fix missing type checks in various functions
Diffstat (limited to 'ext/session')
-rw-r--r--ext/session/session.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/session/session.c b/ext/session/session.c
index 7d145c362b..306aba3a7d 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -296,7 +296,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);
}