diff options
| author | Ondřej Surý <ondrej@sury.org> | 2013-10-27 20:38:12 +0100 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2013-10-27 20:38:12 +0100 |
| commit | 749e5ad39dbac3f4f62be438367f8cdf90056815 (patch) | |
| tree | ad0677df3bf44a6761380686e400ffd878585288 /ext/pdo_pgsql/pgsql_statement.c | |
| parent | 4ed39205864f58ba7c368e4ae1362d8214469fd9 (diff) | |
| download | php-749e5ad39dbac3f4f62be438367f8cdf90056815.tar.gz | |
New upstream version 5.4.21upstream/5.4.21
Diffstat (limited to 'ext/pdo_pgsql/pgsql_statement.c')
| -rw-r--r-- | ext/pdo_pgsql/pgsql_statement.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/pdo_pgsql/pgsql_statement.c b/ext/pdo_pgsql/pgsql_statement.c index d58eebf8f..792ad2707 100644 --- a/ext/pdo_pgsql/pgsql_statement.c +++ b/ext/pdo_pgsql/pgsql_statement.c @@ -536,7 +536,7 @@ static int pgsql_stmt_get_col(pdo_stmt_t *stmt, int colno, char **ptr, unsigned *len = 0; return 0; } else { - char *tmp_ptr = PQunescapeBytea(*ptr, &tmp_len); + char *tmp_ptr = (char *)PQunescapeBytea((unsigned char *)*ptr, &tmp_len); if (!tmp_ptr) { /* PQunescapeBytea returned an error */ *len = 0; @@ -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); |