Fixed bug #41831 (pdo_sqlite prepared statements convert resources to

strings).
This commit is contained in:
Ilia Alshanetsky 2007-08-01 22:45:31 +00:00
parent e942c16f7c
commit 3f1b9990a4
2 changed files with 3 additions and 1 deletions

2
NEWS
View file

@ -122,6 +122,8 @@ PHP NEWS
date_create or new DateTime). (Derick) date_create or new DateTime). (Derick)
- Fixed bug #41833 (addChild() on a non-existent node, no node created, - Fixed bug #41833 (addChild() on a non-existent node, no node created,
getName() segfaults). (Rob) getName() segfaults). (Rob)
- Fixed bug #41831 (pdo_sqlite prepared statements convert resources to
strings). (Ilia)
- Fixed bug #41815 (Concurrent read/write fails when EOF is reached). (Sascha) - Fixed bug #41815 (Concurrent read/write fails when EOF is reached). (Sascha)
- Fixed bug #41813 (segmentation fault when using string offset as an object). - Fixed bug #41813 (segmentation fault when using string offset as an object).
(judas dot iscariote at gmail dot com, Tony) (judas dot iscariote at gmail dot com, Tony)

View file

@ -109,7 +109,7 @@ static int pdo_sqlite_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_d
php_stream *stm; php_stream *stm;
php_stream_from_zval_no_verify(stm, &param->parameter); php_stream_from_zval_no_verify(stm, &param->parameter);
if (stm) { if (stm) {
SEPARATE_ZVAL_IF_NOT_REF(&param->parameter); SEPARATE_ZVAL(&param->parameter);
Z_TYPE_P(param->parameter) = IS_STRING; Z_TYPE_P(param->parameter) = IS_STRING;
Z_STRLEN_P(param->parameter) = php_stream_copy_to_mem(stm, Z_STRLEN_P(param->parameter) = php_stream_copy_to_mem(stm,
&Z_STRVAL_P(param->parameter), PHP_STREAM_COPY_ALL, 0); &Z_STRVAL_P(param->parameter), PHP_STREAM_COPY_ALL, 0);