mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-20 10:43:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

- Complete the fix for #46274, and tests

Browse Source
This commit is contained in:
Felipe Pena 2008-10-12 13:01:31 +00:00
parent 261d300a0f
commit d2d4e044c7
3 changed files with 174 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/pdo/pdo_stmt.c
View File

@ -601,6 +601,8 @@ static inline void fetch_value(pdo_stmt_t *stmt, zval *dest, int colno, int *typ
case PDO_PARAM_LOB:
if (value == NULL) {
ZVAL_NULL(dest);
} else if (strcmp(value, "") == 0) {
ZVAL_EMPTY_STRING(dest);
} else if (value_len == 0) {
if (stmt->dbh->stringify || new_type == PDO_PARAM_STR) {
char *buf = NULL;

85
ext/pdo_pgsql/tests/bug46274.phpt Normal file
View File

@ -0,0 +1,85 @@
--TEST--
Bug #46274 (pdo_pgsql - Segfault when using PDO::ATTR_STRINGIFY_FETCHES and blob)
--SKIPIF--
<?php
if (!extension_loaded('pdo') || !extension_loaded('pdo_pgsql')) die('skip not loaded');
require dirname(__FILE__) . '/config.inc';
require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
PDOTest::skip();
?>
--FILE--
<?php
require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
$db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt');
$db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, true);
$db->query('CREATE TABLE test_one_blob (id SERIAL NOT NULL, blob1 BYTEA)');
$stmt = $db->prepare("INSERT INTO test_one_blob (blob1) VALUES (:foo)");
$data = 'foo';
$blob = fopen('php://memory', 'a');
fwrite($blob, $data);
rewind($blob);
$stmt->bindparam(':foo', $blob, PDO::PARAM_LOB);
$stmt->execute();
$blob = '';
$stmt->bindparam(':foo', $blob, PDO::PARAM_LOB);
$stmt->execute();
$data = '';
$blob = fopen('php://memory', 'a');
fwrite($blob, $data);
rewind($blob);
$stmt->bindparam(':foo', $blob, PDO::PARAM_LOB);
$stmt->execute();
$blob = NULL;
$stmt->bindparam(':foo', $blob, PDO::PARAM_LOB);
$stmt->execute();
$res = $db->query("SELECT blob1 from test_one_blob");
// Resource
var_dump($res->fetch());
// Empty string
var_dump($res->fetch());
// Empty string
var_dump($res->fetch());
// NULL
var_dump($res->fetch());
$db->query('DROP TABLE test_one_blob');
?>
--EXPECTF--
array(2) {
["blob1"]=>
string(3) "foo"
[0]=>
string(3) "foo"
}
array(2) {
["blob1"]=>
string(0) ""
[0]=>
string(0) ""
}
array(2) {
["blob1"]=>
string(0) ""
[0]=>
string(0) ""
}
array(2) {
["blob1"]=>
NULL
[0]=>
NULL
}

87
ext/pdo_pgsql/tests/bug46274_2.phpt Normal file
View File

@ -0,0 +1,87 @@
--TEST--
Bug #46274 (pdo_pgsql - Segfault when using PDO::ATTR_STRINGIFY_FETCHES and blob)
--SKIPIF--
<?php
if (!extension_loaded('pdo') || !extension_loaded('pdo_pgsql')) die('skip not loaded');
require dirname(__FILE__) . '/config.inc';
require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
PDOTest::skip();
?>
--FILE--
<?php
require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
$db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt');
$db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, false);
$db->query('CREATE TABLE test_one_blob (id SERIAL NOT NULL, blob1 BYTEA)');
$stmt = $db->prepare("INSERT INTO test_one_blob (blob1) VALUES (:foo)");
$data = 'foo';
$blob = fopen('php://memory', 'a');
fwrite($blob, $data);
rewind($blob);
$stmt->bindparam(':foo', $blob, PDO::PARAM_LOB);
$stmt->execute();
$blob = '';
$stmt->bindparam(':foo', $blob, PDO::PARAM_LOB);
$stmt->execute();
$data = '';
$blob = fopen('php://memory', 'a');
fwrite($blob, $data);
rewind($blob);
$stmt->bindparam(':foo', $blob, PDO::PARAM_LOB);
$stmt->execute();
$blob = NULL;
$stmt->bindparam(':foo', $blob, PDO::PARAM_LOB);
$stmt->execute();
$res = $db->query("SELECT blob1 from test_one_blob");
// Resource
var_dump($x = $res->fetch());
var_dump(fread($x['blob1'], 10));
// Empty string
var_dump($res->fetch());
// Empty string
var_dump($res->fetch());
// NULL
var_dump($res->fetch());
$db->query('DROP TABLE test_one_blob');
?>
--EXPECTF--
array(2) {
["blob1"]=>
resource(%d) of type (stream)
[0]=>
resource(%d) of type (stream)
}
string(3) "foo"
array(2) {
["blob1"]=>
string(0) ""
[0]=>
string(0) ""
}
array(2) {
["blob1"]=>
string(0) ""
[0]=>
string(0) ""
}
array(2) {
["blob1"]=>
NULL
[0]=>
NULL
}