com php-src: Fix #79877: getimagesize function silently truncates after a null byte: ext/standard/image.c ext/standard/tests/image/bug79877.phpt

Commit: 4d2560dd6a115dee81821e2b0fe6751e61f5c2c0 Author: Christoph M. Becker <cmbecker69@gmx.de> Tue, 21 Jul 2020 11:07:43 +0200 Committer: Stanislav Malyshev <stas@php.net> Mon, 3 Aug 2020 01:09:44 -0700 Parents: 9c3171f019d07b4271c5929478dddba0861e92af Branches: PHP-7..4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4d2560dd6a115dee81821e2b0fe6751e61f5c2c0 Log: Fix #79877: getimagesize function silently truncates after a null byte We have to check for NUL bytes if getimagesize() has been called. Bugs: https://bugs.php.net/79877 Changed paths: M ext/standard/image.c A ext/standard/tests/image/bug79877.phpt Diff: diff --git a/ext/standard/image.c b/ext/standard/image.c index aaaf81ae9e..eeb48ea223 100644 --- a/ext/standard/image.c +++ b/ext/standard/image.c @@ -1496,6 +1496,11 @@ static void php_getimagesize_from_any(INTERNAL_FUNCTION_PARAMETERS, int mode) { Z_PARAM_ZVAL(info) ZEND_PARSE_PARAMETERS_END(); + if (mode == FROM_PATH && CHECK_NULL_PATH(input, input_len)) { + php_error_docref(NULL, E_WARNING, "Invalid path"); + return; + } + if (argc == 2) { info = zend_try_array_init(info); if (!info) { diff --git a/ext/standard/tests/image/bug79877.phpt b/ext/standard/tests/image/bug79877.phpt new file mode 100644 index 0000000000..92e93e59e5 --- /dev/null +++ b/ext/standard/tests/image/bug79877.phpt @@ -0,0 +1,9 @@ +--TEST-- +Bug #79877 (getimagesize function silently truncates after a null byte) +--FILE-- +<?php +var_dump(getimagesize("/tmp/a.png\0xx")); +?> +--EXPECTF-- +Warning: getimagesize(): Invalid path in %s on line %d +NULL