com php-src: Readded tests: Zend/tests/jump15.phpt Zend/tests/t emporary_cleaning_001.phpt Zend/tests/temporary _cleaning_002.phpt
Zend/tests/temporary_cleanin g_003.phpt Zend/tests/temporary_cleaning_00 4.phpt Zend/tests/temporary_cleaning_005.phpt
Zend/tests/temporary_cleaning_006.phpt Zend/te sts/temporary_cleaning_007.phpt

From: Date: Fri, 10 Jul 2015 00:46:57 +0000
Subject: com php-src: Readded tests: Zend/tests/jump15.phpt Zend/tests/t emporary_cleaning_001.phpt Zend/tests/temporary _cleaning_002.phpt
Zend/tests/temporary_cleanin g_003.phpt Zend/tests/temporary_cleaning_00 4.phpt Zend/tests/temporary_cleaning_005.phpt
Zend/tests/temporary_cleaning_006.phpt Zend/te sts/temporary_cleaning_007.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-87886@lists.php.net to get a copy of this message
Commit: 3bb70fe2903acf2caf2600345f07943f34a3b23c Author: Dmitry Stogov <dmitry@zend.com> Fri, 10 Jul 2015 03:46:57 +0300 Parents: bafe9d8c306659ca0a6897951e5aac428a11fb58 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3bb70fe2903acf2caf2600345f07943f34a3b23c Log: Readded tests Changed paths: A Zend/tests/jump15.phpt A Zend/tests/temporary_cleaning_001.phpt A Zend/tests/temporary_cleaning_002.phpt A Zend/tests/temporary_cleaning_003.phpt A Zend/tests/temporary_cleaning_004.phpt A Zend/tests/temporary_cleaning_005.phpt A Zend/tests/temporary_cleaning_006.phpt A Zend/tests/temporary_cleaning_007.phpt Diff: diff --git a/Zend/tests/jump15.phpt b/Zend/tests/jump15.phpt new file mode 100644 index 0000000..456d277 --- /dev/null +++ b/Zend/tests/jump15.phpt @@ -0,0 +1,29 @@ +--TEST-- +jump 15: goto from loop (forward) +--FILE-- +<?php +$ar = array("1","2","3"); +foreach ($ar as $val) { + switch ($val) { + case "1": + echo "1: ok\n"; + break; + case "2": + echo "2: ok\n"; + goto L1; + case "3": + echo "bug\n"; + break; + } +} +echo "bug\n"; +L1: +try { + echo "3: ok\n"; +} finally { +} +?> +--EXPECT-- +1: ok +2: ok +3: ok diff --git a/Zend/tests/temporary_cleaning_001.phpt b/Zend/tests/temporary_cleaning_001.phpt new file mode 100644 index 0000000..40340bc --- /dev/null +++ b/Zend/tests/temporary_cleaning_001.phpt @@ -0,0 +1,25 @@ +--TEST-- +Temporary leak on exception +--XFAIL-- +See Bug #62210 and attempt to fix it in "tmp_livelibess" branch +--FILE-- +<?php + +function ops() { + throw new Exception(); +} + +try { + $x = 2; + $y = new stdClass; + while ($x-- && new stdClass) { + $r = [$x] + ($y ? ((array) $x) + [2] : ops()); + $y = (array) $y; + } +} catch (Exception $e) { +} + +?> +==DONE== +--EXPECT-- +==DONE== diff --git a/Zend/tests/temporary_cleaning_002.phpt b/Zend/tests/temporary_cleaning_002.phpt new file mode 100644 index 0000000..bea54e7 --- /dev/null +++ b/Zend/tests/temporary_cleaning_002.phpt @@ -0,0 +1,32 @@ +--TEST-- +Temporary leak on rope (encapsed string) +--FILE-- +<?php +class Obj { + function __get($x) { + throw new Exception(); + } +} + +$x = new Obj; +$y = 0; + +try { + $r = "$y|$x->x|"; +} catch (Exception $e) { +} + +try { + $r = "$x->x|$y|"; +} catch (Exception $e) { +} + +try { + $r = "$y|$y|$x->x"; +} catch (Exception $e) { +} + +?> +==DONE== +--EXPECT-- +==DONE== diff --git a/Zend/tests/temporary_cleaning_003.phpt b/Zend/tests/temporary_cleaning_003.phpt new file mode 100644 index 0000000..0f7d945 --- /dev/null +++ b/Zend/tests/temporary_cleaning_003.phpt @@ -0,0 +1,21 @@ +--TEST-- +Fundamental memory leak test on temporaries +--XFAIL-- +See Bug #62210 and attempt to fix it in "tmp_livelibess" branch +--FILE-- +<?php + +function ops() { + throw new Exception(); +} + +try{ + $x = 1; + $r = [$x] + ops(); +} catch (Exception $e) { +} + +?> +==DONE== +--EXPECT-- +==DONE== diff --git a/Zend/tests/temporary_cleaning_004.phpt b/Zend/tests/temporary_cleaning_004.phpt new file mode 100644 index 0000000..e2b0936 --- /dev/null +++ b/Zend/tests/temporary_cleaning_004.phpt @@ -0,0 +1,46 @@ +--TEST-- +Temporary leak with switch +--XFAIL-- +See Bug #62210 and attempt to fix it in "tmp_livelibess" branch +--FILE-- +<?php + +function ops() { + throw new Exception(); +} + +$a = [new stdClass, new stdClass]; +switch ($a[0]) { + case false: + break; + default: + try { + $x = 2; + $y = new stdClass; + while ($x-- && new stdClass) { + $r = [$x] + ($y ? ((array) $x) + [2] : ops()); + $y = (array) $y; + } + } catch (Exception $e) { + } +} + +try { + switch ($a[0]) { + case false: + break; + default: + $x = 2; + $y = new stdClass; + while ($x-- && new stdClass) { + $r = [$x] + ($y ? ((array) $x) + [2] : ops()); + $y = (array) $y; + } + } +} catch (Exception $e) { +} + +?> +==DONE== +--EXPECT-- +==DONE== diff --git a/Zend/tests/temporary_cleaning_005.phpt b/Zend/tests/temporary_cleaning_005.phpt new file mode 100644 index 0000000..f671c32 --- /dev/null +++ b/Zend/tests/temporary_cleaning_005.phpt @@ -0,0 +1,50 @@ +--TEST-- +Temporary leak with foreach +--XFAIL-- +See Bug #62210 and attempt to fix it in "tmp_livelibess" branch +--FILE-- +<?php + +function ops() { + throw new Exception(); +} + +$a = [new stdClass, new stdClass]; +foreach ([$a, [new stdClass]] as $b) { + switch ($b[0]) { + case false: + break; + default: + try { + $x = 2; + $y = new stdClass; + while ($x-- && new stdClass) { + $r = [$x] + ($y ? ((array) $x) + [2] : ops()); + $y = (array) $y; + } + } catch (Exception $e) { + } + } +} + +foreach ([$a, [new stdClass]] as $b) { + try { + switch ($b[0]) { + case false: + break; + default: + $x = 2; + $y = new stdClass; + while ($x-- && new stdClass) { + $r = [$x] + ($y ? ((array) $x) + [2] : ops()); + $y = (array) $y; + } + } + } catch (Exception $e) { + } +} + +?> +==DONE== +--EXPECT-- +==DONE== diff --git a/Zend/tests/temporary_cleaning_006.phpt b/Zend/tests/temporary_cleaning_006.phpt new file mode 100644 index 0000000..758260d --- /dev/null +++ b/Zend/tests/temporary_cleaning_006.phpt @@ -0,0 +1,18 @@ +--TEST-- +Exception after separation during indirect write to fcall result +--FILE-- +<?php + +function throwing() { throw new Exception; } + +function getArray() { return [0]; } + +try { + getArray()[throwing()] = 1; +} catch (Exception $e) { + echo "Exception\n"; +} + +?> +--EXPECT-- +Exception diff --git a/Zend/tests/temporary_cleaning_007.phpt b/Zend/tests/temporary_cleaning_007.phpt new file mode 100644 index 0000000..0e29ed6 --- /dev/null +++ b/Zend/tests/temporary_cleaning_007.phpt @@ -0,0 +1,22 @@ +--TEST-- +Exception inside a foreach loop with return +--FILE-- +<?php +class saboteurTestController { + public function isConsistent() { throw new \Exception(); } +} + +$controllers = array(new saboteurTestController(),new saboteurTestController()); +foreach ($controllers as $controller) { + try { + if ($controller->isConsistent()) { + return $controller; + } + } catch (\Exception $e) { + echo "Exception\n"; + } +} +?> +--EXPECT-- +Exception +Exception

« previous php.cvs (#87886) next »