archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix blob parameters binding. Fixes: #73087, #61183, #71494

Browse source 
Adjusted formatting according to requirements

Test case for bug #73087
This commit is contained in:
Dorin Marcoci 2016-11-04 13:15:01 +02:00 • committed by Anatol Belski
parent 3b78cabc88
commit 3d73f718b2
2 changed files with 49 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

30
ext/pdo_firebird/firebird_statement.c
View file

@ -413,6 +413,7 @@ static int firebird_bind_blob(pdo_stmt_t *stmt, ISC_QUAD *blob_id, zval *param)
pdo_firebird_stmt *S = (pdo_firebird_stmt*)stmt->driver_data; pdo_firebird_stmt *S = (pdo_firebird_stmt*)stmt->driver_data;
pdo_firebird_db_handle *H = S->H; pdo_firebird_db_handle *H = S->H;
isc_blob_handle h = PDO_FIREBIRD_HANDLE_INITIALIZER; isc_blob_handle h = PDO_FIREBIRD_HANDLE_INITIALIZER;
zval data;
zend_ulong put_cnt = 0, rem_cnt; zend_ulong put_cnt = 0, rem_cnt;
unsigned short chunk_size; unsigned short chunk_size;
int result = 1; int result = 1;
@ -422,14 +423,16 @@ static int firebird_bind_blob(pdo_stmt_t *stmt, ISC_QUAD *blob_id, zval *param)
return 0; return 0;
} }
SEPARATE_ZVAL(param); data = *param;
convert_to_string_ex(param);
for (rem_cnt = Z_STRLEN_P(param); rem_cnt > 0; rem_cnt -= chunk_size) { if (Z_TYPE_P(param) != IS_STRING) {
zval_copy_ctor(&data);
convert_to_string(&data);
}
for (rem_cnt = Z_STRLEN(data); rem_cnt > 0; rem_cnt -= chunk_size) {
chunk_size = rem_cnt > USHRT_MAX ? USHRT_MAX : (unsigned short)rem_cnt; chunk_size = rem_cnt > USHRT_MAX ? USHRT_MAX : (unsigned short)rem_cnt;
if (isc_put_segment(H->isc_status, &h, chunk_size, &Z_STRVAL(data)[put_cnt])) {
if (isc_put_segment(H->isc_status, &h, chunk_size, &Z_STRVAL_P(param)[put_cnt])) {
RECORD_ERROR(stmt); RECORD_ERROR(stmt);
result = 0; result = 0;
break; break;
@ -437,7 +440,9 @@ static int firebird_bind_blob(pdo_stmt_t *stmt, ISC_QUAD *blob_id, zval *param)
put_cnt += chunk_size; put_cnt += chunk_size;
} }
zval_dtor(param); if (Z_TYPE_P(param) != IS_STRING) {
zval_dtor(&data);
}
if (isc_close_blob(H->isc_status, &h)) { if (isc_close_blob(H->isc_status, &h)) {
RECORD_ERROR(stmt); RECORD_ERROR(stmt);
@ -542,8 +547,19 @@ static int firebird_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_dat
S->H->last_app_error = "Cannot bind to array field"; S->H->last_app_error = "Cannot bind to array field";
return 0; return 0;
case SQL_BLOB: case SQL_BLOB: {
if (Z_TYPE_P(parameter) == IS_NULL) {
/* Check if field allow NULL values */
if (~var->sqltype & 1) {
strcpy(stmt->error_code, "HY105");
S->H->last_app_error = "Parameter requires non-null value";
return 0;
}
*var->sqlind = -1;
return 1;
}
return firebird_bind_blob(stmt, (ISC_QUAD*)var->sqldata, parameter); return firebird_bind_blob(stmt, (ISC_QUAD*)var->sqldata, parameter);
}
} }
/* check if a NULL should be inserted */ /* check if a NULL should be inserted */

26
ext/pdo_firebird/tests/bug_73087.phpt Normal file
View file

@ -0,0 +1,26 @@
--TEST--
PDO_Firebird: bug 73087 segfault binding blob parameter
--SKIPIF--
<?php if (!extension_loaded('interbase') || !extension_loaded('pdo_firebird')) die('skip'); ?>
--FILE--
<?php
require 'testdb.inc';
$C = new PDO('firebird:dbname='.$test_base, $user, $password) or die;
@$C->exec('drop table atable');
$C->exec('create table atable (id integer not null, content blob sub_type 1 segment size 80)');
$S = $C->prepare('insert into atable (id, content) values (:id, :content)');
for ($I = 1; $I < 10; $I++) {
$Params = [
'id' => $I,
'content' => base64_encode(random_bytes(10))
];
foreach ($Params as $Param => $Value)
$S->bindValue($Param, $Value);
$S->execute();
}
unset($S);
unset($C);
echo 'OK';
?>
--EXPECT--
OK