diff options
| author | Stig Bakken <ssb@php.net> | 1999-04-12 16:35:25 +0000 |
|---|---|---|
| committer | Stig Bakken <ssb@php.net> | 1999-04-12 16:35:25 +0000 |
| commit | 4213b5d6b6431d6f359330fcf474d975fa7b3ccf (patch) | |
| tree | 27b179d54081c6cb8a6a2baa9b2653dfa3769df8 /main/php_ini.c | |
| parent | 483caf3669f8c02e5d1b514515d00d5c4e2644f4 (diff) | |
| download | php-git-4213b5d6b6431d6f359330fcf474d975fa7b3ccf.tar.gz | |
tolerate uninitialized ini settings in php_ini_{long,double,string}()
Diffstat (limited to 'main/php_ini.c')
| -rw-r--r-- | main/php_ini.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/main/php_ini.c b/main/php_ini.c index 384422eddb..a8fe299249 100644 --- a/main/php_ini.c +++ b/main/php_ini.c @@ -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; } } |