diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2003-08-14 17:49:08 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2003-08-14 17:49:08 +0000 |
| commit | 38a98c55f789d0505c52db1af597de85d9498d31 (patch) | |
| tree | c5537264e1df1b7fe93de79b224b50a7928cb0fc /ext/pgsql/pgsql.c | |
| parent | bf759e9609ce0034c5dae9af3fa6e5aaa636ca00 (diff) | |
| download | php-git-38a98c55f789d0505c52db1af597de85d9498d31.tar.gz | |
Fixed bug #25093 (Various leaks due to non-freed queries)
Diffstat (limited to 'ext/pgsql/pgsql.c')
| -rw-r--r-- | ext/pgsql/pgsql.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index ed09d48cbb..54b604cc26 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -1072,6 +1072,7 @@ PHP_FUNCTION(pg_query) case PGRES_FATAL_ERROR: php_error_docref(NULL TSRMLS_CC, E_WARNING, "Query failed: %s", PQErrorMessageTrim(pgsql, &msgbuf)); efree(msgbuf); + PQclear(pgsql_result); RETURN_FALSE; break; case PGRES_COMMAND_OK: /* successful command that did not return rows */ @@ -1083,6 +1084,7 @@ PHP_FUNCTION(pg_query) pg_result->row = 0; ZEND_REGISTER_RESOURCE(return_value, pg_result, le_result); } else { + PQclear(pgsql_result); RETURN_FALSE; } break; @@ -1229,6 +1231,7 @@ static char *get_field_name(PGconn *pgsql, Oid oid, HashTable *list TSRMLS_DC) ret = estrdup(tmp_name); } } + PQclear(result); } smart_str_free(&str); @@ -3299,6 +3302,7 @@ PHPAPI int php_pgsql_meta_data(PGconn *pg_link, const char *table_name, zval *me name = PQgetvalue(pg_result,i,0); add_assoc_zval(meta, name, elem); } + PQclear(pg_result); return SUCCESS; } @@ -4129,6 +4133,7 @@ static int do_exec(smart_str *querystr, int expect, PGconn *pg_link, ulong opt T pg_result = PQexec(pg_link, querystr->c); if (PQresultStatus(pg_result) == expect) { + PQclear(pg_result); return 0; } else { php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Failed to execute '%s'", querystr->c); @@ -4598,9 +4603,9 @@ PHPAPI int php_pgsql_select(PGconn *pg_link, const char *table, zval *ids_array, ret = php_pgsql_result2array(pg_result, ret_array TSRMLS_CC); } else { php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Failed to execute '%s'", querystr.c); - PQclear(pg_result); } - + PQclear(pg_result); + cleanup: if (!(opt & PGSQL_DML_NO_CONV)) { zval_dtor(ids_converted); |