-
-
Save anonymous/ba60b922906a9c5a685e104c7b7994a8 to your computer and use it in GitHub Desktop.
Patch for 72114
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
commit abd159cce48f3e34f08e4751c568e09677d5ec9c | |
Author: Stanislav Malyshev <stas@php.net> | |
Date: Mon May 9 21:55:29 2016 -0700 | |
Fix bug #72114 - int/size_t confusion in fread | |
diff --git a/ext/standard/file.c b/ext/standard/file.c | |
index 0abc022..e39c84f 100644 | |
--- a/ext/standard/file.c | |
+++ b/ext/standard/file.c | |
@@ -1758,6 +1758,12 @@ PHPAPI PHP_FUNCTION(fread) | |
RETURN_FALSE; | |
} | |
+ if (len > INT_MAX) { | |
+ /* string length is int in 5.x so we can not read more than int */ | |
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Length parameter must be no more than %d", INT_MAX); | |
+ RETURN_FALSE; | |
+ } | |
+ | |
Z_STRVAL_P(return_value) = emalloc(len + 1); | |
Z_STRLEN_P(return_value) = php_stream_read(stream, Z_STRVAL_P(return_value), len); | |
diff --git a/ext/standard/tests/file/bug72114.phpt b/ext/standard/tests/file/bug72114.phpt | |
new file mode 100644 | |
index 0000000..5e591ee | |
--- /dev/null | |
+++ b/ext/standard/tests/file/bug72114.phpt | |
@@ -0,0 +1,12 @@ | |
+--TEST-- | |
+Bug #72114 (Integer underflow / arbitrary null write in fread/gzread) | |
+--FILE-- | |
+<?php | |
+ini_set('memory_limit', "2500M"); | |
+$fp = fopen("/dev/zero", "r"); | |
+fread($fp, 2147483648); | |
+?> | |
+Done | |
+--EXPECTF-- | |
+Warning: fread(): Length parameter must be no more than 2147483647 in %s/bug72114.php on line %d | |
+Done |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment