MFH: return FALSE

helly25 · helly25 · commit 7e8986450d3f · 2002-12-05T12:55:02.000Z
diff --git a/ext/standard/image.c b/ext/standard/image.c
@@ -574,25 +574,28 @@ PHP_FUNCTION(getimagesize)
 
 	case 1:
 		if (zend_get_parameters_ex(1, &arg1) == FAILURE) {
+			RETVAL_FALSE;
 			WRONG_PARAM_COUNT;
 		}
 		convert_to_string_ex(arg1);
 		break;
 
 	case 2:
 		if (zend_get_parameters_ex(2, &arg1, &info) == FAILURE) {
+			RETVAL_FALSE;
 			WRONG_PARAM_COUNT;
 		}
 		zval_dtor(*info);
 
 		if (array_init(*info) == FAILURE) {
-			return;
+			RETURN_FALSE;
 		}
 
 		convert_to_string_ex(arg1);
 		break;
 
 	default:
+		RETVAL_FALSE;
 		WRONG_PARAM_COUNT;
 		break;
 	}
@@ -667,7 +670,7 @@ PHP_FUNCTION(getimagesize)
 		if (array_init(return_value) == FAILURE) {
 			php_error(E_ERROR, "Unable to initialize array");
 			efree(result);
-			return;
+			RETURN_FALSE;
 		}
 		add_index_long(return_value, 0, result->width);
 		add_index_long(return_value, 1, result->height);
@@ -682,6 +685,8 @@ PHP_FUNCTION(getimagesize)
 			add_assoc_long(return_value, "channels", result->channels);
 		}
 		efree(result);
+	} else {
+		RETURN_FALSE;
 	}
 }
 /* }}} */

Original file line number	Diff line number	Diff line change
`@@ -574,25 +574,28 @@ PHP_FUNCTION(getimagesize)`
`574`	`574`
`575`	`575`	`case 1:`
`576`	`576`	`if (zend_get_parameters_ex(1, &arg1) == FAILURE) {`
	`577`	`+ RETVAL_FALSE;`
`577`	`578`	`WRONG_PARAM_COUNT;`
`578`	`579`	`}`
`579`	`580`	`convert_to_string_ex(arg1);`
`580`	`581`	`break;`
`581`	`582`
`582`	`583`	`case 2:`
`583`	`584`	`if (zend_get_parameters_ex(2, &arg1, &info) == FAILURE) {`
	`585`	`+ RETVAL_FALSE;`
`584`	`586`	`WRONG_PARAM_COUNT;`
`585`	`587`	`}`
`586`	`588`	`zval_dtor(*info);`
`587`	`589`
`588`	`590`	`if (array_init(*info) == FAILURE) {`
`589`		`- return;`
	`591`	`+ RETURN_FALSE;`
`590`	`592`	`}`
`591`	`593`
`592`	`594`	`convert_to_string_ex(arg1);`
`593`	`595`	`break;`
`594`	`596`
`595`	`597`	`default:`
	`598`	`+ RETVAL_FALSE;`
`596`	`599`	`WRONG_PARAM_COUNT;`
`597`	`600`	`break;`
`598`	`601`	`}`
`@@ -667,7 +670,7 @@ PHP_FUNCTION(getimagesize)`
`667`	`670`	`if (array_init(return_value) == FAILURE) {`
`668`	`671`	`php_error(E_ERROR, "Unable to initialize array");`
`669`	`672`	`efree(result);`
`670`		`- return;`
	`673`	`+ RETURN_FALSE;`
`671`	`674`	`}`
`672`	`675`	`add_index_long(return_value, 0, result->width);`
`673`	`676`	`add_index_long(return_value, 1, result->height);`
`@@ -682,6 +685,8 @@ PHP_FUNCTION(getimagesize)`
`682`	`685`	`add_assoc_long(return_value, "channels", result->channels);`
`683`	`686`	`}`
`684`	`687`	`efree(result);`
	`688`	`+ } else {`
	`689`	`+ RETURN_FALSE;`
`685`	`690`	`}`
`686`	`691`	`}`
`687`	`692`	`/* }}} */`