diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-08-12 14:11:34 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-08-12 14:42:26 +0200 |
| commit | 4281b1378e514a203aa69f1131838796caf000cc (patch) | |
| tree | 05e90e182feb7187d9864055c70716963e2f5ec1 | |
| parent | 1a9a5f995c273b57ef1b42a8c68bcd736110b4a7 (diff) | |
| download | php-git-4281b1378e514a203aa69f1131838796caf000cc.tar.gz | |
Don't explicitly set return value on ZPP/ZFR failure
Failing `zend_parse_parameters()` and `zend_fetch_resource()` throw as
of PHP 8.0.0, so explicitly setting a return value is useless, and also
slightly confusing.
| -rw-r--r-- | ext/gd/gd.c | 2 | ||||
| -rw-r--r-- | ext/gd/gd_ctx.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/gd/gd.c b/ext/gd/gd.c index 07fbe231b4..35edc9403c 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -1265,7 +1265,7 @@ PHP_FUNCTION(imagegrabwindow) gdImagePtr im = NULL; if (zend_parse_parameters(ZEND_NUM_ARGS(), "l|l", &lwindow_handle, &client_area) == FAILURE) { - RETURN_FALSE; + return; } window = (HWND) lwindow_handle; diff --git a/ext/gd/gd_ctx.c b/ext/gd/gd_ctx.c index dcdf8ad803..52265de4ba 100644 --- a/ext/gd/gd_ctx.c +++ b/ext/gd/gd_ctx.c @@ -120,7 +120,7 @@ static void _php_image_output_ctx(INTERNAL_FUNCTION_PARAMETERS, int image_type, } if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(imgind), "Image", phpi_get_le_gd())) == NULL) { - RETURN_FALSE; + return; } if (image_type != PHP_GDIMG_TYPE_BMP && argc >= 3) { |