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

Merge branch 'PHP-8.4'

Browse source
This commit is contained in:
David Carlier 2025-03-26 17:46:38 +00:00
commit 50bffd3284
No known key found for this signature in database
GPG key ID: 2FB76A8CE6CD2B41
2 changed files with 27 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ext/pgsql/pgsql.c
View file

@ -3390,11 +3390,12 @@ static zend_result pgsql_copy_from_query(PGconn *pgsql, PGresult *pgsql_result,
if (UNEXPECTED(!tmp)) { if (UNEXPECTED(!tmp)) {
return FAILURE; return FAILURE;
} }
zend_string *zquery = zend_string_alloc(ZSTR_LEN(tmp) + 1, false); zend_string *zquery = zend_string_alloc(ZSTR_LEN(tmp) + 2, false);
memcpy(ZSTR_VAL(zquery), ZSTR_VAL(tmp), ZSTR_LEN(tmp) + 1); memcpy(ZSTR_VAL(zquery), ZSTR_VAL(tmp), ZSTR_LEN(tmp) + 1);
ZSTR_LEN(zquery) = ZSTR_LEN(tmp); ZSTR_LEN(zquery) = ZSTR_LEN(tmp);
if (ZSTR_LEN(tmp) > 0 && ZSTR_VAL(zquery)[ZSTR_LEN(tmp)] != '\n') { if (ZSTR_LEN(tmp) > 0 && ZSTR_VAL(zquery)[ZSTR_LEN(tmp) - 1] != '\n') {
ZSTR_VAL(zquery)[ZSTR_LEN(tmp)] = '\n'; ZSTR_VAL(zquery)[ZSTR_LEN(tmp)] = '\n';
ZSTR_VAL(zquery)[ZSTR_LEN(tmp) + 1] = '\0';
ZSTR_LEN(zquery) ++; ZSTR_LEN(zquery) ++;
} }
if (PQputCopyData(pgsql, ZSTR_VAL(zquery), ZSTR_LEN(zquery)) != 1) { if (PQputCopyData(pgsql, ZSTR_VAL(zquery), ZSTR_LEN(zquery)) != 1) {

24
ext/pgsql/tests/gh18148.phpt Normal file
View file

@ -0,0 +1,24 @@
--TEST--
Fix GH-18148 pg_copy_from() command position offset when giving explicit \n terminator
--EXTENSIONS--
pgsql
--SKIPIF--
<?php
include("inc/skipif.inc");
?>
--FILE--
<?php
include "inc/config.inc";
$table_name = "gh18148";
$db = pg_connect($conn_str);
pg_query($db, "CREATE TABLE {$table_name} (a integer, b text)");
var_dump(pg_copy_from( $db, $table_name, [ "1\tone\n" ] ));
--CLEAN--
<?php
include('inc/config.inc');
$db = pg_connect($conn_str);
pg_query($db, "DROP TABLE IF EXISTS gh18148 cascade");
?>
--EXPECT--
bool(true)