projects
/
m6w6
/
ext-http
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (from parent 1:
c0eca50
)
- proper type checking, thanks Sara
author
Michael Wallner
<mike@php.net>
Fri, 9 Dec 2005 16:18:07 +0000
(16:18 +0000)
committer
Michael Wallner
<mike@php.net>
Fri, 9 Dec 2005 16:18:07 +0000
(16:18 +0000)
http_api.c
patch
|
blob
|
history
diff --git
a/http_api.c
b/http_api.c
index 0bb6cf22a9b6ae65a7f089cf902f64a406d2d44d..6f6c5d63993175d7fbc080c12461c6d64307ddf8 100644
(file)
--- a/
http_api.c
+++ b/
http_api.c
@@
-296,10
+296,10
@@
PHP_HTTP_API zval *_http_get_server_var_ex(const char *key, size_t key_size, zen
zval **hsv;
zval **var;
zval **hsv;
zval **var;
- if (
SUCCESS != zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void **) &hsv
)) {
+ if (
(SUCCESS != zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void **) &hsv)) || (Z_TYPE_PP(hsv) != IS_ARRAY
)) {
return NULL;
}
return NULL;
}
- if (
SUCCESS != zend_hash_find(Z_ARRVAL_PP(hsv), (char *) key, key_size, (void **) &var
)) {
+ if (
(SUCCESS != zend_hash_find(Z_ARRVAL_PP(hsv), (char *) key, key_size, (void **) &var)) || (Z_TYPE_PP(var) != IS_STRING
)) {
return NULL;
}
if (check && !(Z_STRVAL_PP(var) && Z_STRLEN_PP(var))) {
return NULL;
}
if (check && !(Z_STRVAL_PP(var) && Z_STRLEN_PP(var))) {