Fixed line endings

This commit is contained in:
David Puglielli 2017-11-07 16:06:19 -08:00
parent e79f46b709
commit e2e82b245b
2 changed files with 83 additions and 83 deletions

View file

@ -1,82 +1,82 @@
--TEST-- --TEST--
Checks that calling query() after beginTransaction() with an invalid query does not cause a crash. Fix for Github 434. Checks that calling query() after beginTransaction() with an invalid query does not cause a crash. Fix for Github 434.
--DESCRIPTION-- --DESCRIPTION--
Calling beginTransaction() and then query() with an invalid query can cause a crash in php.exe or php-cgi.exe, Calling beginTransaction() and then query() with an invalid query can cause a crash in php.exe or php-cgi.exe,
which may manifest as a CLI crash or produce an error message saying "Faulting Module[...]odbc32.dll". The which may manifest as a CLI crash or produce an error message saying "Faulting Module[...]odbc32.dll". The
cause is an attempt to double free a statement handle after script execution which had not been properly freed cause is an attempt to double free a statement handle after script execution which had not been properly freed
during rollback. This test tells us nothing under run-tests.php because the crash only occurs at the end of during rollback. This test tells us nothing under run-tests.php because the crash only occurs at the end of
script execution, so any expected output already exists and the test would pass. Therefore manual verification script execution, so any expected output already exists and the test would pass. Therefore manual verification
is necessary - this test should be run separately to verify no crash occurs. is necessary - this test should be run separately to verify no crash occurs.
--SKIPIF-- --SKIPIF--
<?php require('skipif.inc'); ?> <?php require('skipif.inc'); ?>
--FILE-- --FILE--
<?php <?php
require_once("MsSetup.inc"); require_once("MsSetup.inc");
$conn = new PDO("sqlsrv:Server=$server; database = $databaseName", $uid, $pwd); $conn = new PDO("sqlsrv:Server=$server; database = $databaseName", $uid, $pwd);
$conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_SILENT); $conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_SILENT);
for ($i = 0; $i < 50; $i++) { for ($i = 0; $i < 50; $i++) {
echo "Iteration $i\n"; echo "Iteration $i\n";
if ($conn->beginTransaction()) { if ($conn->beginTransaction()) {
$stmt = $conn->query('SELECT fakecolumn FROM faketable'); $stmt = $conn->query('SELECT fakecolumn FROM faketable');
} }
$conn->commit(); $conn->commit();
} }
$conn = null; $conn = null;
echo "Done.\n"; echo "Done.\n";
?> ?>
--EXPECT-- --EXPECT--
Iteration 0 Iteration 0
Iteration 1 Iteration 1
Iteration 2 Iteration 2
Iteration 3 Iteration 3
Iteration 4 Iteration 4
Iteration 5 Iteration 5
Iteration 6 Iteration 6
Iteration 7 Iteration 7
Iteration 8 Iteration 8
Iteration 9 Iteration 9
Iteration 10 Iteration 10
Iteration 11 Iteration 11
Iteration 12 Iteration 12
Iteration 13 Iteration 13
Iteration 14 Iteration 14
Iteration 15 Iteration 15
Iteration 16 Iteration 16
Iteration 17 Iteration 17
Iteration 18 Iteration 18
Iteration 19 Iteration 19
Iteration 20 Iteration 20
Iteration 21 Iteration 21
Iteration 22 Iteration 22
Iteration 23 Iteration 23
Iteration 24 Iteration 24
Iteration 25 Iteration 25
Iteration 26 Iteration 26
Iteration 27 Iteration 27
Iteration 28 Iteration 28
Iteration 29 Iteration 29
Iteration 30 Iteration 30
Iteration 31 Iteration 31
Iteration 32 Iteration 32
Iteration 33 Iteration 33
Iteration 34 Iteration 34
Iteration 35 Iteration 35
Iteration 36 Iteration 36
Iteration 37 Iteration 37
Iteration 38 Iteration 38
Iteration 39 Iteration 39
Iteration 40 Iteration 40
Iteration 41 Iteration 41
Iteration 42 Iteration 42
Iteration 43 Iteration 43
Iteration 44 Iteration 44
Iteration 45 Iteration 45
Iteration 46 Iteration 46
Iteration 47 Iteration 47
Iteration 48 Iteration 48
Iteration 49 Iteration 49
Done. Done.

View file

@ -79,4 +79,4 @@ separately to verify no crash occurs.
Iteration 47 Iteration 47
Iteration 48 Iteration 48
Iteration 49 Iteration 49
Done. Done.