diff options
| author | Marcus Boerger <helly@php.net> | 2002-12-05 12:55:02 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2002-12-05 12:55:02 +0000 |
| commit | 7e8986450d3f3d5d4f80f0debbabb53856e0b397 (patch) | |
| tree | ce56040a66e385c84cd33cddb4a0848e6ae7e91d | |
| parent | 24f66fbf0318ca60304c8180ab5f0b296e565be0 (diff) | |
| download | php-git-7e8986450d3f3d5d4f80f0debbabb53856e0b397.tar.gz | |
MFH: return FALSE
| -rw-r--r-- | ext/standard/image.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/ext/standard/image.c b/ext/standard/image.c index 8d0d0705e1..12e7c8f14c 100644 --- a/ext/standard/image.c +++ b/ext/standard/image.c @@ -574,6 +574,7 @@ PHP_FUNCTION(getimagesize) case 1: if (zend_get_parameters_ex(1, &arg1) == FAILURE) { + RETVAL_FALSE; WRONG_PARAM_COUNT; } convert_to_string_ex(arg1); @@ -581,18 +582,20 @@ 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; } @@ -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; } } /* }}} */ |