com php-src: Fixed meta data retrieve when OID is larger than 2^31: NEWS ext/pdo_pgsql/pgsql_statement.c
| From: | Yasuo Ohgaki | Date: | Fri, 12 Jul 2013 21:06:23 +0000 |
| Subject: | com php-src: Fixed meta data retrieve when OID is larger than 2^31: NEWS ext/pdo_pgsql/pgsql_statement.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-72623@lists.php.net to get a copy of this message | ||
Commit: 0ddb3d97de1f4c7e2a2a81182aa581ac76f2a300
Author: Yasuo Ohgaki <yohgaki@php.net> Thu, 11 Jul 2013 12:23:11 +0900
Parents: d2a83efe5b5a49181afe75346a9d33286b8d2ef8
Branches: PHP-5.4
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0ddb3d97de1f4c7e2a2a81182aa581ac76f2a300
Log:
Fixed meta data retrieve when OID is larger than 2^31
Changed paths:
M NEWS
M ext/pdo_pgsql/pgsql_statement.c
Diff:
diff --git a/NEWS b/NEWS
index 323fed4..5507b2a 100644
--- a/NEWS
+++ b/NEWS
@@ -46,6 +46,9 @@ PHP NEWS
. Allowed PDO_OCI to compile with Oracle Database 12c client libraries.
(Chris Jones)
+- PDO_pgsql:
+ . Fixed meta data retrieve when OID is larger than 2^31. (Yasuo)
+
- Phar:
. Fixed Bug #65142 (Missing phar man page). (Remi)
diff --git a/ext/pdo_pgsql/pgsql_statement.c b/ext/pdo_pgsql/pgsql_statement.c
index d58eebf..3ef8919 100644
--- a/ext/pdo_pgsql/pgsql_statement.c
+++ b/ext/pdo_pgsql/pgsql_statement.c
@@ -587,7 +587,7 @@ static int pgsql_stmt_get_column_meta(pdo_stmt_t *stmt, long colno, zval *return
add_assoc_long(return_value, "pgsql:oid", S->cols[colno].pgsql_type);
/* Fetch metadata from Postgres system catalogue */
- spprintf(&q, 0, "SELECT TYPNAME FROM PG_TYPE WHERE OID=%d",
S->cols[colno].pgsql_type);
+ spprintf(&q, 0, "SELECT TYPNAME FROM PG_TYPE WHERE OID=%u",
S->cols[colno].pgsql_type);
res = PQexec(S->H->server, q);
efree(q);