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

stigsb · stigsb · commit 4213b5d6b643 · 1999-04-12T16:35:25.000Z
diff --git 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;
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -189,9 +189,9 @@ long php_ini_long(char *name, uint name_length, int orig)`
`189`	`189`
`190`	`190`	`if (_php3_hash_find(&known_directives, name, name_length, (void **) &ini_entry)==SUCCESS) {`
`191`	`191`	`if (orig && ini_entry->orig_value) {`
`192`		`- return (long) atoi(ini_entry->orig_value);`
`193`		`- } else {`
`194`		`- return (long) atoi(ini_entry->value);`
	`192`	`+ return strtol(ini_entry->orig_value, NULL, 0);`
	`193`	`+ } else if (ini_entry->value) {`
	`194`	`+ return strtol(ini_entry->value, NULL, 0);`
`195`	`195`	`}`
`196`	`196`	`}`
`197`	`197`
`@@ -206,7 +206,7 @@ double php_ini_double(char *name, uint name_length, int orig)`
`206`	`206`	`if (_php3_hash_find(&known_directives, name, name_length, (void **) &ini_entry)==SUCCESS) {`
`207`	`207`	`if (orig && ini_entry->orig_value) {`
`208`	`208`	`return (double) strtod(ini_entry->orig_value, NULL);`
`209`		`- } else {`
	`209`	`+ } else if (ini_entry->value) {`
`210`	`210`	`return (double) strtod(ini_entry->value, NULL);`
`211`	`211`	`}`
`212`	`212`	`}`
`@@ -222,7 +222,7 @@ char php_ini_string(char name, uint name_length, int orig)`
`222`	`222`	`if (_php3_hash_find(&known_directives, name, name_length, (void **) &ini_entry)==SUCCESS) {`
`223`	`223`	`if (orig && ini_entry->orig_value) {`
`224`	`224`	`return ini_entry->orig_value;`
`225`		`- } else {`
	`225`	`+ } else if (ini_entry->value) {`
`226`	`226`	`return ini_entry->value;`
`227`	`227`	`}`
`228`	`228`	`}`