From: Marcus Boerger <helly@php.net>
Date: Thu, 5 Dec 2002 12:39:00 +0000 (+0000)
Subject: Return FALSE on error as mentioned by John Coggeshall.
X-Git-Tag: RELEASE_1_0b3~171
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=373361d9c447e250ee9283620d7435934c4e02e7;p=php

Return FALSE on error as mentioned by John Coggeshall.
See Bug #20822
---

diff --git a/ext/standard/image.c b/ext/standard/image.c
index 6de174cad8..92cab3654e 100644
--- a/ext/standard/image.c
+++ b/ext/standard/image.c
@@ -825,6 +825,7 @@ PHP_FUNCTION(image_type_to_mime_type)
 	int arg_c = ZEND_NUM_ARGS();
 
 	if ((arg_c!=1) || zend_get_parameters_ex(arg_c, &p_image_type) == FAILURE) {
+		RETVAL_FALSE;
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_long_ex(p_image_type);
@@ -896,6 +897,7 @@ PHP_FUNCTION(getimagesize)
 
 	case 1:
 		if (zend_get_parameters_ex(1, &arg1) == FAILURE) {
+			RETVAL_FALSE;
 			WRONG_PARAM_COUNT;
 		}
 		convert_to_string_ex(arg1);
@@ -903,20 +905,21 @@ PHP_FUNCTION(getimagesize)
 
 	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;
 	}
 
 	stream = php_stream_open_wrapper(Z_STRVAL_PP(arg1), "rb", REPORT_ERRORS|IGNORE_PATH|ENFORCE_SAFE_MODE, NULL);
@@ -976,7 +979,7 @@ PHP_FUNCTION(getimagesize)
 		if (array_init(return_value) == FAILURE) {
 			php_error_docref(NULL TSRMLS_CC, 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);