Skip to content

Fix GH-18148: pg_copy_from() wrong \n offset check. #18149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
+28 −2
Closed

Fix GH-18148: pg_copy_from() wrong \n offset check. #18149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions ext/pgsql/pgsql.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3451,11 +3451,13 @@ PHP_FUNCTION(pg_copy_from)
if (UNEXPECTED(!tmp)) {
return;
}
zend_string *zquery = zend_string_alloc(ZSTR_LEN(tmp) + 1, false);
// we give allocation room for a potential command line `\n` terminator addition
zend_string *zquery = zend_string_alloc(ZSTR_LEN(tmp) + 2, false);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we have a comment for why this is +2?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the input string does not end with a linefeed, space is required for the input string plus a linefeed plus the final nul byte.

Copy link
Member Author

@devnexen devnexen Mar 26, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

She probably got it :) it was more a request than a question I believe, so we do not forget months later.

memcpy(ZSTR_VAL(zquery), ZSTR_VAL(tmp), ZSTR_LEN(tmp) + 1);
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) + 1] = '\0';
ZSTR_LEN(zquery) ++;
}
if (PQputCopyData(pgsql, ZSTR_VAL(zquery), ZSTR_LEN(zquery)) != 1) {
Expand Down
24 changes: 24 additions & 0 deletions ext/pgsql/tests/gh18148.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Loading