com php-src: Add test for bug #69522: ext/standard/pack.c ext/standard/tests/strings/bug69522.phpt
| From: | Stanislav Malyshev | Date: | Mon, 11 May 2015 08:10:35 +0000 |
| Subject: | com php-src: Add test for bug #69522: ext/standard/pack.c ext/standard/tests/strings/bug69522.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86701@lists.php.net to get a copy of this message | ||
Commit: 9c0813fd48023634f6ce97e66de0fb9b7c196cda
Author: Stanislav Malyshev <stas@php.net> Mon, 11 May 2015 01:10:35 -0700
Parents: 634aa0a2dbf8ec5e6fabb4ee01c6d1355ba7ee67
Branches: PHP-5.4 PHP-5.4.41
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9c0813fd48023634f6ce97e66de0fb9b7c196cda
Log:
Add test for bug #69522
Bugs:
https://bugs.php.net/69522
Changed paths:
M ext/standard/pack.c
A ext/standard/tests/strings/bug69522.phpt
Diff:
diff --git a/ext/standard/pack.c b/ext/standard/pack.c
index c1c2c7a..20c7bf0 100644
--- a/ext/standard/pack.c
+++ b/ext/standard/pack.c
@@ -642,6 +642,12 @@ PHP_FUNCTION(unpack)
break;
}
+ if (size != 0 && size != -1 && size < 0) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Type %c: integer overflow", type);
+ zval_dtor(return_value);
+ RETURN_FALSE;
+ }
+
/* Do actual unpacking */
for (i = 0; i != arg; i++ ) {
/* Space for name + number, safe as namelen is ensured <= 200 */
diff --git a/ext/standard/tests/strings/bug69522.phpt b/ext/standard/tests/strings/bug69522.phpt
new file mode 100644
index 0000000...fc86d40
--- /dev/null
+++ b/ext/standard/tests/strings/bug69522.phpt
@@ -0,0 +1,11 @@
+--TEST--
+Bug #69522 (heap buffer overflow in unpack())
+--FILE--
+<?php
+$a = pack("AAAAAAAAAAAA", 1,2,3,4,5,6,7,8,9,10,11,12);
+$b = unpack('h2147483648', $a);
+?>
+===DONE===
+--EXPECTF--
+Warning: unpack(): Type h: integer overflow in %s on line %d
+===DONE===