php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

tolerate uninitialized ini settings in php_ini_{long,double,string}()

Browse Source
This commit is contained in:
Stig Bakken
1999-04-12 16:35:25 +00:00
parent 483caf3669
commit 4213b5d6b6
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
main/php_ini.c
View File

@@ -189,9 +189,9 @@ long php_ini_long(char *name, uint name_length, int orig)
if (_php3_hash_find(&known_directives, name, name_length, (void **) &ini_entry)==SUCCESS) {
if (orig && ini_entry->orig_value) {
return (long) atoi(ini_entry->orig_value);
} else {
return (long) atoi(ini_entry->value);
return strtol(ini_entry->orig_value, NULL, 0);
} else if (ini_entry->value) {
return strtol(ini_entry->value, NULL, 0);
}
}
@@ -206,7 +206,7 @@ double php_ini_double(char *name, uint name_length, int orig)
if (_php3_hash_find(&known_directives, name, name_length, (void **) &ini_entry)==SUCCESS) {
if (orig && ini_entry->orig_value) {
return (double) strtod(ini_entry->orig_value, NULL);
} else {
} else if (ini_entry->value) {
return (double) strtod(ini_entry->value, NULL);
}
}
@@ -222,7 +222,7 @@ char *php_ini_string(char *name, uint name_length, int orig)
if (_php3_hash_find(&known_directives, name, name_length, (void **) &ini_entry)==SUCCESS) {
if (orig && ini_entry->orig_value) {
return ini_entry->orig_value;
} else {
} else if (ini_entry->value) {
return ini_entry->value;
}
}