com php-src: Add test for bug #69522: ext/standard/pack.c ext/standard/tests/strings/bug69522.phpt

From: Date: Wed, 13 May 2015 09:31:57 +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-86726@lists.php.net to get a copy of this message
Commit: b4161815990a1f2dec8b7ca8c131deadcf32f30c Author: Stanislav Malyshev <stas@php.net> Mon, 11 May 2015 01:10:35 -0700 Committer: Julien Pauli <jpauli@php.net> Wed, 13 May 2015 11:31:57 +0200 Parents: b91f75914edbe06d68895f4f96d5da6f302ec936 Branches: PHP-5.5.25 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b4161815990a1f2dec8b7ca8c131deadcf32f30c 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 a874b7a..9d362eb 100644 --- a/ext/standard/pack.c +++ b/ext/standard/pack.c @@ -654,6 +654,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===

« previous php.cvs (#86726) next »