Skip to content

Fix bug #54379 PDO_OCI: UTF-8 output gets truncated#2276

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
gureedo wants to merge 1 commit into from
Closed

Fix bug #54379 PDO_OCI: UTF-8 output gets truncated #2276

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
7 changes: 7 additions & 0 deletions ext/pdo_oci/oci_driver.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -699,6 +699,13 @@ static int pdo_oci_handle_factory(pdo_dbh_t *dbh, zval *driver_options) /* {{{ *
goto cleanup;
}

/* Get max character width */
H->last_err = OCINlsNumericInfoGet(H->env, H->err, &H->max_char_width, OCI_NLS_CHARSET_MAXBYTESZ);
if (H->last_err) {
oci_drv_error("OCINlsNumericInfoGet: OCI_NLS_CHARSET_MAXBYTESZ");
goto cleanup;
}

dbh->methods = &oci_methods;
dbh->alloc_own_columns = 1;
dbh->native_case = PDO_CASE_UPPER;
Expand Down
5 changes: 2 additions & 3 deletions ext/pdo_oci/oci_statement.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -602,9 +602,8 @@ static int oci_stmt_describe(pdo_stmt_t *stmt, int colno) /* {{{ */
} else {
S->cols[colno].datalen = (ub4) col->maxlen;
}
if (dtype == SQLT_BIN) {
S->cols[colno].datalen *= 3;
}

S->cols[colno].datalen *= S->H->max_char_width;

@cjbjcjbjJan 25, 2017•
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Lines 602-606 need to be:

 } else if (dtype == SQLT_BIN){
S->cols[colno].datalen = (ub4) col->maxlen * 2; // raw characters to hex digits
} else {
S->cols[colno].datalen = (ub4) (col->maxlen * S->H->max_char_width);
}

@cjbjcjbjJan 25, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Rationale from the developer who looked at it is:
"Given raw data(SQLT_BIN) is defined as SQLT_CHR (See line #609), raw is returned as strings. So 1 byte raw is represented as two bytes of hex digits.
For example, a 1-byte raw data 'FF' is converted to two 'F' characters. So we need to multiply by 2 (not 3) to accommodate the translation of raw to hex digits. max_char_width should be used for character strings.

Apart from that, other changes all look good including the testcase. The test would normally be skipped in the test suite as a UTF-8 DSN is required.

But we can see the skip reason in the test result and run it manually if required."

S->cols[colno].data = emalloc(S->cols[colno].datalen + 1);
dtype = SQLT_CHR;

Expand Down
1 change: 1 addition & 0 deletions ext/pdo_oci/php_pdo_oci_int.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ typedef struct {
ub4 prefetch;
ub2 charset;
sword last_err;
sb4 max_char_width;

unsigned attached:1;
unsigned _reserved:31;
Expand Down
47 changes: 47 additions & 0 deletions ext/pdo_oci/tests/bug54379.phpt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
--TEST--
Bug #54379 (PDO_OCI: UTF-8 output gets truncated)
--SKIPIF--
<?php
if (!extension_loaded('pdo') || !extension_loaded('pdo_oci'))
die('skip not loaded');
require dirname(__FILE__).'/../../pdo/tests/pdo_test.inc';
if (!preg_match('/charset=.*utf8/i', getenv('PDOTEST_DSN')))
die('skip not UTF8 DSN');
PDOTest::skip();
?>
--FILE--
<?php
require 'ext/pdo/tests/pdo_test.inc';
$db = PDOTest::test_factory('ext/pdo_oci/tests/common.phpt');
$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);

try {
$db->exec("DROP TABLE test");
} catch (Exception $e) {
}

$db->exec("CREATE TABLE test (col1 NVARCHAR2(100))");
$db->exec("INSERT INTO test VALUES('12345678901234567890')");
$db->exec("INSERT INTO test VALUES('Русские символы по три байта')");

$stmt = $db->prepare("SELECT * FROM test");

$stmt->execute();
var_dump($stmt->fetchAll(PDO::FETCH_ASSOC));

$db->exec("DROP TABLE test");

?>
--EXPECTF--
array(2) {
[0]=>
array(1) {
["col1"]=>
string(20) "12345678901234567890"
}
[1]=>
array(1) {
["col1"]=>
string(52) "Русские символы по три байта"
}
}