pgsql: Use cheaper string conversion functions

ndossche · ndossche · commit 8e84e9a5514e · 2025-10-20T20:41:38.000+02:00
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
@@ -3409,7 +3409,8 @@ PHP_FUNCTION(pg_copy_to)
 
 static zend_result pgsql_copy_from_query(PGconn *pgsql, PGresult *pgsql_result, zval *value)
 {
-	zend_string *tmp = zval_try_get_string(value);
+	zend_string *tmp_tmp;
+	zend_string *tmp = zval_try_get_tmp_string(value, &tmp_tmp);
 	if (UNEXPECTED(!tmp)) {
 		return FAILURE;
 	}
@@ -3423,11 +3424,11 @@ static zend_result pgsql_copy_from_query(PGconn *pgsql, PGresult *pgsql_result,
 	}
 	if (PQputCopyData(pgsql, ZSTR_VAL(zquery), ZSTR_LEN(zquery)) != 1) {
 		zend_string_release_ex(zquery, false);
-		zend_string_release(tmp);
+		zend_tmp_string_release(tmp_tmp);
 		return FAILURE;
 	}
 	zend_string_release_ex(zquery, false);
-	zend_string_release(tmp);
+	zend_tmp_string_release(tmp_tmp);
 	return SUCCESS;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -3409,7 +3409,8 @@ PHP_FUNCTION(pg_copy_to)`
`3409`	`3409`
`3410`	`3410`	`static zend_result pgsql_copy_from_query(PGconn pgsql, PGresult pgsql_result, zval *value)`
`3411`	`3411`	`{`
`3412`		`- zend_string *tmp = zval_try_get_string(value);`
	`3412`	`+ zend_string *tmp_tmp;`
	`3413`	`+ zend_string *tmp = zval_try_get_tmp_string(value, &tmp_tmp);`
`3413`	`3414`	`if (UNEXPECTED(!tmp)) {`
`3414`	`3415`	`return FAILURE;`
`3415`	`3416`	`}`
`@@ -3423,11 +3424,11 @@ static zend_result pgsql_copy_from_query(PGconn pgsql, PGresult pgsql_result,`
`3423`	`3424`	`}`
`3424`	`3425`	`if (PQputCopyData(pgsql, ZSTR_VAL(zquery), ZSTR_LEN(zquery)) != 1) {`
`3425`	`3426`	`zend_string_release_ex(zquery, false);`
`3426`		`- zend_string_release(tmp);`
	`3427`	`+ zend_tmp_string_release(tmp_tmp);`
`3427`	`3428`	`return FAILURE;`
`3428`	`3429`	`}`
`3429`	`3430`	`zend_string_release_ex(zquery, false);`
`3430`		`- zend_string_release(tmp);`
	`3431`	`+ zend_tmp_string_release(tmp_tmp);`
`3431`	`3432`	`return SUCCESS;`
`3432`	`3433`	`}`
`3433`	`3434`