archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

ext/pdo_pgsql: updating copy from according to pgsql extension workflow. (#18175)

Browse source 
mainly using zend_string instead.
This commit is contained in:
David CARLIER 2025-03-28 18:24:45 +00:00 • committed by GitHub
parent b6becada17
commit a5196bf3d6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
ext/pdo_pgsql/pgsql_driver.c
View file

@ -619,27 +619,29 @@ static bool pgsql_handle_rollback(pdo_dbh_t *dbh)
static bool _pdo_pgsql_send_copy_data(pdo_pgsql_db_handle *H, zval *line) { static bool _pdo_pgsql_send_copy_data(pdo_pgsql_db_handle *H, zval *line) {
size_t query_len; size_t query_len;
char *query; zend_string *query;
if (!try_convert_to_string(line)) { if (!try_convert_to_string(line)) {
return false; return false;
} }
query_len = Z_STRLEN_P(line); query_len = Z_STRLEN_P(line);
query = emalloc(query_len + 2); /* room for \n\0 */ query = zend_string_alloc(query_len + 2, false); /* room for \n\0 */
memcpy(query, Z_STRVAL_P(line), query_len); memcpy(ZSTR_VAL(query), Z_STRVAL_P(line), query_len + 1);
ZSTR_LEN(query) = query_len;
if (query[query_len - 1] != '\n') { if (query_len > 0 && ZSTR_VAL(query)[query_len - 1] != '\n') {
query[query_len++] = '\n'; ZSTR_VAL(query)[query_len] = '\n';
ZSTR_VAL(query)[query_len + 1] = '\0';
ZSTR_LEN(query) ++;
} }
query[query_len] = '\0';
if (PQputCopyData(H->server, query, query_len) != 1) { if (PQputCopyData(H->server, ZSTR_VAL(query), ZSTR_LEN(query)) != 1) {
efree(query); zend_string_release_ex(query, false);
return false; return false;
} }
efree(query); zend_string_release_ex(query, false);
return true; return true;
} }