Skip to content

Fix: pdo pgsql test 12423 #12453

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Fix: pdo pgsql test 12423 #12453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4dcf063
Fixed GH-11917: primitives seem to be passed via reference instead of…
dstogov Oct 16, 2023
a7dcc55
Optimized pdo_pgsql connection test
SakiTakamachi Oct 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ext/opcache/jit/zend_jit_x86.dasc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5188,7 +5188,7 @@ static int zend_jit_long_math_helper(dasm_State **Dst,
result_reg = ZREG_R0;
} else {
/* ASSIGN_DIM_OP */
if (sizeof(void*) == 4
if (ZREG_FCARG1 == ZREG_RCX
&& (opcode == ZEND_SL || opcode == ZEND_SR)
&& Z_MODE(op2_addr) != IS_CONST_ZVAL) {
result_reg = ZREG_R2;
Expand Down
61 changes: 61 additions & 0 deletions ext/opcache/tests/jit/gh11917.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
--TEST--
GH-11917: primitives seem to be passed via reference instead of by value under some conditions when JIT is enabled on windows
--INI--
opcache.enable=1
opcache.enable_cli=1
--FILE--
<?php
$a = [2147483647,2147483647,2147483647,3,0,0,32,2147483584,127];
echo crc32(json_encode(bitwise_small_split($a))) . "\n";
echo crc32(json_encode(bitwise_small_split($a))) . "\n";
echo crc32(json_encode(bitwise_small_split($a))) . "\n";
echo crc32(json_encode(bitwise_small_split($a))) . "\n";

function bitwise_small_split($val)
{
$split = 8;
$vals = [];

$mask = (1 << $split) - 1;

$i = $overflow = 0;
$len = count($val);
$val[] = 0;
$remaining = 31;

while ($i != $len) {
$digit = $val[$i] & $mask;

$val[$i] >>= $split;
if (!$overflow) {
$remaining -= $split;
$overflow = $split <= $remaining ? 0 : $split - $remaining;

if (!$remaining) {
$i++;
$remaining = 31;
$overflow = 0;
}
} elseif (++$i != $len) {
$tempmask = (1 << $overflow) - 1;
$digit |= ($val[$i] & $tempmask) << $remaining;
$val[$i] >>= $overflow;
$remaining = 31 - $overflow;
$overflow = $split <= $remaining ? 0 : $split - $remaining;
}

$vals[] = $digit;
}

while ($vals[count($vals) - 1] == 0) {
unset($vals[count($vals) - 1]);
}

return array_reverse($vals);
}
?>
--EXPECT--
48207660
48207660
48207660
48207660
25 changes: 16 additions & 9 deletions ext/pdo_pgsql/tests/gh12423.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
--TEST--
GitHub #12424 (Fix GH-12423: [pdo_pgsql] Changed to prioritize DSN authentication information over arguments.)
--EXTENSIONS--
pdo
pdo_pgsql
--SKIPIF--
<?php
if (!extension_loaded('pdo') || !extension_loaded('pdo_pgsql')) die('skip not loaded');
require __DIR__ . '/../../../ext/pdo/tests/pdo_test.inc';
require __DIR__ . '/config.inc';
if (strpos($config['ENV']['PDOTEST_DSN'], 'password=') === false && !isset($config['ENV']['PDOTEST_PASS'])) {
die('skip no password');
}
PDOTest::skip();
?>
--FILE--
Expand All @@ -15,53 +20,55 @@ $dsnWithCredentials = $config['ENV']['PDOTEST_DSN'];
$user = $config['ENV']['PDOTEST_USER'] ?? null;
$password = $config['ENV']['PDOTEST_PASS'] ?? null;
if (!$user) {
preg_match('/user=(.*?) /', $dsnWithCredentials, $match);
preg_match('/user=([^ ]*?)/', $dsnWithCredentials, $match);
$user = $match[1] ?? '';
}
if (!$password) {
preg_match('/password=(.*?)$/', $dsnWithCredentials, $match);
preg_match('/password=([^ ]*?)/', $dsnWithCredentials, $match);
$password = $match[1] ?? '';
}
$dsn = str_replace(" user={$user} password={$password}", '', $dsnWithCredentials);
$dsn = str_replace("user={$user}", '', $dsnWithCredentials);
$dsn = str_replace("password={$password}", '', $dsn);
$dsn = rtrim($dsn);

echo "dsn without credentials / correct user / correct password\n";
try {
$db = new PDO($dsn, $user, $password, [PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION]);
echo "Connected.\n\n";
} catch (PDOException $e) {
echo $e->getMessage();
echo $e->getMessage()."\n";
}

echo "dsn with credentials / no user / no password\n";
try {
$db = new PDO("{$dsn} user={$user} password={$password}", null, null, [PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION]);
echo "Connected.\n\n";
} catch (PDOException $e) {
echo $e->getMessage();
echo $e->getMessage()."\n";
}

echo "dsn with correct user / incorrect user / correct password\n";
try {
$db = new PDO("{$dsn} user={$user}", 'hoge', $password, [PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION]);
echo "Connected.\n\n";
} catch (PDOException $e) {
echo $e->getMessage();
echo $e->getMessage()."\n";
}

echo "dsn with correct password / correct user / incorrect password\n";
try {
$db = new PDO("{$dsn} password={$password}", $user, 'fuga', [PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION]);
echo "Connected.\n\n";
} catch (PDOException $e) {
echo $e->getMessage();
echo $e->getMessage()."\n";
}

echo "dsn with correct credentials / incorrect user / incorrect password\n";
try {
$db = new PDO("{$dsn} user={$user} password={$password}", 'hoge', 'fuga', [PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION]);
echo "Connected.\n";
} catch (PDOException $e) {
echo $e->getMessage();
echo $e->getMessage()."\n";
}
?>
--EXPECT--
Expand Down