mirror of
https://github.com/php/php-src.git
synced 2024-12-03 06:44:07 +08:00
Fix uninitalized variables reads. See CWE-457 for more info.
This commit is contained in:
parent
b16fdebcf8
commit
6621840951
@ -3891,7 +3891,7 @@ static int _php_mbstr_parse_mail_headers(HashTable *ht, const char *str, size_t
|
||||
int state = 0;
|
||||
int crlf_state = -1;
|
||||
char *token = NULL;
|
||||
size_t token_pos;
|
||||
size_t token_pos = 0;
|
||||
zend_string *fld_name, *fld_val;
|
||||
|
||||
ps = str;
|
||||
@ -3917,7 +3917,7 @@ static int _php_mbstr_parse_mail_headers(HashTable *ht, const char *str, size_t
|
||||
}
|
||||
|
||||
if (state == 0 || state == 1) {
|
||||
if(token) {
|
||||
if(token && token_pos > 0) {
|
||||
fld_name = zend_string_init(token, token_pos, 0);
|
||||
}
|
||||
state = 2;
|
||||
@ -3983,7 +3983,7 @@ static int _php_mbstr_parse_mail_headers(HashTable *ht, const char *str, size_t
|
||||
|
||||
case 3:
|
||||
if (crlf_state == -1) {
|
||||
if(token) {
|
||||
if(token && token_pos > 0) {
|
||||
fld_val = zend_string_init(token, token_pos, 0);
|
||||
}
|
||||
|
||||
@ -4032,7 +4032,7 @@ out:
|
||||
state = 3;
|
||||
}
|
||||
if (state == 3) {
|
||||
if(token) {
|
||||
if(token && token_pos > 0) {
|
||||
fld_val = zend_string_init(token, token_pos, 0);
|
||||
}
|
||||
if (fld_name != NULL && fld_val != NULL) {
|
||||
|
@ -3978,6 +3978,7 @@ static int _adddynproperty(zval *ptr, int num_args, va_list args, zend_hash_key
|
||||
if (zend_get_property_info(ce, hash_key->key, 1) == NULL) {
|
||||
zend_property_info property_info;
|
||||
|
||||
property_info.doc_comment = NULL;
|
||||
property_info.flags = ZEND_ACC_IMPLICIT_PUBLIC;
|
||||
property_info.name = hash_key->key;
|
||||
property_info.ce = ce;
|
||||
|
@ -2255,6 +2255,7 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
|
||||
|
||||
zuv.html_errors = 1;
|
||||
zuv.import_use_extension = ".php";
|
||||
zuv.import_use_extension_length = (uint)strlen(zuv.import_use_extension);
|
||||
php_startup_auto_globals();
|
||||
zend_set_utility_values(&zuv);
|
||||
php_startup_sapi_content_types();
|
||||
|
Loading…
Reference in New Issue
Block a user