Fix PDO::query() for drivers that emulate bound parameters.

diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c
index 0855e145ed8500fe84862acf687de0e309a35f12..2a0be813bf725bb1939fdeda2ec9cae50793c28d 100755 (executable)
--- a/ext/pdo/pdo_dbh.c
+++ b/ext/pdo/pdo_dbh.c
@@ -722,6 +722,8 @@ static PHP_METHOD(PDO, query)
        stmt->query_string = estrndup(statement, statement_len);
        stmt->query_stringlen = statement_len;
        stmt->default_fetch_type = PDO_FETCH_BOTH;
+       stmt->active_query_string = stmt->query_stirng;
+       stmt->active_query_stringlen = statement_len;
 
        if (dbh->methods->preparer(dbh, statement, statement_len, stmt, driver_options TSRMLS_CC)) {
                /* prepared; create a statement object for PHP land to access it */
@@ -764,6 +766,7 @@ static PHP_METHOD(PDO, query)
                
                /* TODO: kill the object handle for the stmt here */
        } else {
+               efree(stmt->query_string);
                efree(stmt);
                PDO_HANDLE_DBH_ERR();
        }