summaryrefslogtreecommitdiff
path: root/ext/pgsql/pgsql.c
diff options
context:
space:
mode:
authorFelipe Pena <felipe@php.net>2008-10-13 13:41:16 +0000
committerFelipe Pena <felipe@php.net>2008-10-13 13:41:16 +0000
commitee5494ac9e291fa705e55275a3310e48a8432cb3 (patch)
tree7339e44a6a2617cc458d0b00e3c208a1ffcf364d /ext/pgsql/pgsql.c
parent7dd5608d9d3a47352bc6014ed4dd890daed2ce4d (diff)
downloadphp-git-ee5494ac9e291fa705e55275a3310e48a8432cb3.tar.gz
- Fixed bug #37100 (data is returned truncated with BINARY CURSOR)
Patch by Tony
Diffstat (limited to 'ext/pgsql/pgsql.c')
-rw-r--r--ext/pgsql/pgsql.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index ed7036d697..7cf0d5942d 100644
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -2472,10 +2472,9 @@ PHP_FUNCTION(pg_fetch_result)
if (PQgetisnull(pgsql_result, pgsql_row, field_offset)) {
Z_TYPE_P(return_value) = IS_NULL;
} else {
- Z_STRVAL_P(return_value) = PQgetvalue(pgsql_result, pgsql_row, field_offset);
- Z_STRLEN_P(return_value) = (Z_STRVAL_P(return_value) ? strlen(Z_STRVAL_P(return_value)) : 0);
- Z_STRVAL_P(return_value) = safe_estrndup(Z_STRVAL_P(return_value),Z_STRLEN_P(return_value));
- Z_TYPE_P(return_value) = IS_STRING;
+ char *value = PQgetvalue(pgsql_result, pgsql_row, field_offset);
+ int value_len = PQgetlength(pgsql_result, pgsql_row, field_offset);
+ ZVAL_STRINGL(return_value, value, value_len, 1);
}
}
/* }}} */