com php-src: Fixed pg_version() crash with older postgresql: ext/pgsql/pgsql.c

From: Date: Wed, 15 Jan 2014 04:32:15 +0000
Subject: com php-src: Fixed pg_version() crash with older postgresql: ext/pgsql/pgsql.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-75627@lists.php.net to get a copy of this message
Commit: d0924c2500f06129ac2b66bb022be4dcc1f0bb7e Author: Yasuo Ohgaki <yohgaki@php.net> Wed, 15 Jan 2014 13:32:15 +0900 Parents: 167eaedcbdb494c87c4f83d2897a9fdb614e7062 Branches: PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d0924c2500f06129ac2b66bb022be4dcc1f0bb7e Log: Fixed pg_version() crash with older postgresql Changed paths: M ext/pgsql/pgsql.c Diff: diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index 29a5b10..d51389f 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -1504,17 +1504,38 @@ static void php_pgsql_get_link_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type add_assoc_long(return_value, "protocol", PQprotocolVersion(pgsql)); #if HAVE_PQPARAMETERSTATUS if (PQprotocolVersion(pgsql) >= 3) { + char *tmp; add_assoc_string(return_value, "server", (char*)PQparameterStatus(pgsql, "server_version"), 1); - add_assoc_string(return_value, "server_encoding", (char*)PQparameterStatus(pgsql, "server_encoding"), 1); - add_assoc_string(return_value, "application_name", (char*)PQparameterStatus(pgsql, "application_name"), 1); - add_assoc_string(return_value, "is_superuser", (char*)PQparameterStatus(pgsql, "is_superuser"), 1); - add_assoc_string(return_value, "session_authorization", (char*)PQparameterStatus(pgsql, "session_authorization"), 1); - add_assoc_string(return_value, "DateStyle", (char*)PQparameterStatus(pgsql, "DateStyle"), 1); - add_assoc_string(return_value, "IntervalStyle", (char*)PQparameterStatus(pgsql, "IntervalStyle"), 1); - add_assoc_string(return_value, "TimeZone", (char*)PQparameterStatus(pgsql, "TimeZone"), 1); - add_assoc_string(return_value, "integer_datetimes", (char*)PQparameterStatus(pgsql, "integer_datetimes"), 1); - add_assoc_string(return_value, "standard_conforming_strings", (char*)PQparameterStatus(pgsql, "standard_conforming_strings"), 1); - add_assoc_string(return_value, "server_encoding", (char*)PQparameterStatus(pgsql, "server_encoding"), 1); + if ((tmp = (char*)PQparameterStatus(pgsql, "server_encoding"))) { + add_assoc_string(return_value, "server_encoding", tmp, 1); + } + if ((tmp = (char*)PQparameterStatus(pgsql, "application_name"))) { + add_assoc_string(return_value, "application_name", tmp, 1); + } + if ((tmp = (char*)PQparameterStatus(pgsql, "is_superuser"))) { + add_assoc_string(return_value, "is_superuser", tmp, 1); + } + if ((tmp = (char*)PQparameterStatus(pgsql, "session_authorization"))) { + add_assoc_string(return_value, "session_authorization", tmp, 1); + } + if ((tmp = (char*)PQparameterStatus(pgsql, "DateStyle"))) { + add_assoc_string(return_value, "DateStyle", tmp, 1); + } + if ((tmp = (char*)PQparameterStatus(pgsql, "IntervalStyle"))) { + add_assoc_string(return_value, "IntervalStyle", tmp, 1); + } + if ((tmp = (char*)PQparameterStatus(pgsql, "TimeZone"))) { + add_assoc_string(return_value, "TimeZone", tmp, 1); + } + if ((tmp = (char*)PQparameterStatus(pgsql, "integer_datetimes"))) { + add_assoc_string(return_value, "integer_datetimes", tmp, 1); + } + if ((tmp = (char*)PQparameterStatus(pgsql, "standard_conforming_strings"))) { + add_assoc_string(return_value, "standard_conforming_strings", tmp, 1); + } + if ((tmp = (char*)PQparameterStatus(pgsql, "server_encoding"))) { + add_assoc_string(return_value, "server_encoding", tmp, 1); + } } #endif #endif

« previous php.cvs (#75627) next »