com php-src: Fix #79877: getimagesize function silently truncates after a null byte: NEWS ext/standard/image.c ext/standard/tests/image/bug79877.phpt
| From: | Christoph Michael Becker | Date: | Mon, 03 Aug 2020 09:04:57 +0000 |
| Subject: | com php-src: Fix #79877: getimagesize function silently truncates after a null byte: NEWS ext/standard/image.c ext/standard/tests/image/bug79877.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-112505@lists.php.net to get a copy of this message | ||
Commit: 09171dc1d73a4239192cf6b80e66bfc055841dda
Author: Christoph M. Becker <cmbecker69@gmx.de> Tue, 21 Jul 2020 11:07:43 +0200
Parents: f57a99937967ed010c6c57b339b703a3fff5eaa6
Branches: PHP-7.3.21
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=09171dc1d73a4239192cf6b80e66bfc055841dda
Log:
Fix #79877: getimagesize function silently truncates after a null byte
We have to check for NUL bytes if
getimagesize() has been called.
(cherry picked from commit ff577b04c0d250473a0ef46f8e332960fec3ca2c)
Bugs:
https://bugs.php.net/79877
Changed paths:
M NEWS
M ext/standard/image.c
A ext/standard/tests/image/bug79877.phpt
Diff:
diff --git a/NEWS b/NEWS
index 10820bb391..3ac4dc80d8 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,8 @@ PHP NEWS
to return usec). (Herbert256)
- Core:
+ . Fixed bug #79877 (getimagesize function silently truncates after a null
+ byte) (cmb)
. Fixed bug #79778 (Assertion failure if dumping closure with unresolved
static variable). (Nikita)
. Fixed bug #79792 (HT iterators not removed if empty array is destroyed).
diff --git a/ext/standard/image.c b/ext/standard/image.c
index 2aafad9f2a..fc4d6bdc7b 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_DEREF(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) {
zval_ptr_dtor(info);
array_init(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