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 (parent:
4407379
)
make sure we're not caught by uninitialized values
author
Michael Wallner
<mike@php.net>
Tue, 24 Jan 2012 16:33:04 +0000
(16:33 +0000)
committer
Michael Wallner
<mike@php.net>
Tue, 24 Jan 2012 16:33:04 +0000
(16:33 +0000)
php_http_env.c
patch
|
blob
|
history
diff --git
a/php_http_env.c
b/php_http_env.c
index a0232d201e174141fb0061cf7e8a46040e137735..a13e797aeffd1c6689ba48074154bcbd7d52133c 100644
(file)
--- a/
php_http_env.c
+++ b/
php_http_env.c
@@
-619,8
+619,8
@@
zend_function_entry php_http_env_method_entry[] = {
PHP_METHOD(HttpEnv, getRequestHeader)
{
PHP_METHOD(HttpEnv, getRequestHeader)
{
- char *header_name_str;
- int header_name_len;
+ char *header_name_str
= NULL
;
+ int header_name_len
= 0
;
if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!", &header_name_str, &header_name_len)) {
if (header_name_str && header_name_len) {
if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!", &header_name_str, &header_name_len)) {
if (header_name_str && header_name_len) {
@@
-827,7
+827,7
@@
PHP_METHOD(HttpEnv, persistentHandlesClean)
char *name_str = NULL, *ident_str = NULL;
int name_len = 0, ident_len = 0;
char *name_str = NULL, *ident_str = NULL;
int name_len = 0, ident_len = 0;
- if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s
s
", &name_str, &name_len, &ident_str, &ident_len)) {
+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s
!s!
", &name_str, &name_len, &ident_str, &ident_len)) {
php_http_persistent_handle_cleanup(name_str, name_len, ident_str, ident_len TSRMLS_CC);
}
}
php_http_persistent_handle_cleanup(name_str, name_len, ident_str, ident_len TSRMLS_CC);
}
}