From: Xinchen Hui <laruence@php.net>
Date: Fri, 16 May 2014 06:38:24 +0000 (+0800)
Subject: Finish ext/pdo_pgsql (3 tests fail, 1 due to knew issue, 2 also fails in trunk)
X-Git-Tag: POST_PHPNG_MERGE~340
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e8c2b54b9e4b3c81c1a92431c1ebd86cc8d72c7f;p=php

Finish ext/pdo_pgsql (3 tests fail, 1 due to knew issue, 2 also fails in trunk)
---

diff --git a/ext/pdo_pgsql/pgsql_statement.c b/ext/pdo_pgsql/pgsql_statement.c
index 9395b1693d..10e775d899 100644
--- a/ext/pdo_pgsql/pgsql_statement.c
+++ b/ext/pdo_pgsql/pgsql_statement.c
@@ -355,10 +355,10 @@ static int pgsql_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_data *
 						S->param_lengths[param->paramno] = 1;
 						S->param_formats[param->paramno] = 0;
 					} else {
-						//???SEPARATE_ZVAL_IF_NOT_REF(&param->parameter);
+						//SEPARATE_ZVAL_IF_NOT_REF(&param->parameter);
 						convert_to_string_ex(parameter);
-						S->param_values[param->paramno] = Z_STRVAL(param->parameter);
-						S->param_lengths[param->paramno] = Z_STRLEN(param->parameter);
+						S->param_values[param->paramno] = Z_STRVAL_P(parameter);
+						S->param_lengths[param->paramno] = Z_STRLEN_P(parameter);
 						S->param_formats[param->paramno] = 0;
 					}
 
@@ -381,7 +381,7 @@ static int pgsql_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_data *
 			} else {
 				parameter = &param->parameter;
 			}
-			//????SEPARATE_ZVAL(&param->parameter);
+			SEPARATE_ZVAL(&param->parameter);
 			param->param_type = PDO_PARAM_STR;
 			ZVAL_STRINGL(parameter, Z_TYPE_P(parameter) == IS_TRUE ? "t" : "f", 1);
 		}