From 3f1b9990a4b6abc681b490f00e2ef66f9e39771d Mon Sep 17 00:00:00 2001 From: Ilia Alshanetsky Date: Wed, 1 Aug 2007 22:45:31 +0000 Subject: [PATCH] Fixed bug #41831 (pdo_sqlite prepared statements convert resources to strings). --- NEWS | 2 ++ ext/pdo_sqlite/sqlite_statement.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 6d391895f3..c46728ab34 100644 --- a/NEWS +++ b/NEWS @@ -122,6 +122,8 @@ PHP NEWS date_create or new DateTime). (Derick) - Fixed bug #41833 (addChild() on a non-existent node, no node created, 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 #41813 (segmentation fault when using string offset as an object). (judas dot iscariote at gmail dot com, Tony) diff --git a/ext/pdo_sqlite/sqlite_statement.c b/ext/pdo_sqlite/sqlite_statement.c index 8e58ff8367..c831795246 100644 --- a/ext/pdo_sqlite/sqlite_statement.c +++ b/ext/pdo_sqlite/sqlite_statement.c @@ -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_from_zval_no_verify(stm, ¶m->parameter); if (stm) { - SEPARATE_ZVAL_IF_NOT_REF(¶m->parameter); + SEPARATE_ZVAL(¶m->parameter); Z_TYPE_P(param->parameter) = IS_STRING; Z_STRLEN_P(param->parameter) = php_stream_copy_to_mem(stm, &Z_STRVAL_P(param->parameter), PHP_STREAM_COPY_ALL, 0); -- 2.40.0