diff options
| author | peter <peter@FreeBSD.org> | 2013-07-28 05:14:54 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2013-07-28 05:14:54 +0000 |
| commit | b910f82d487cf989800adbd1a65b3a7f71b46277 (patch) | |
| tree | 983fbc233aad0f26d3f835f8d9db270a7ddb0494 /dbd/apr_dbd_pgsql.c | |
| parent | a8f6409a75aa79fd55552dae377d17f57633eb74 (diff) | |
| download | FreeBSD-src-b910f82d487cf989800adbd1a65b3a7f71b46277.zip FreeBSD-src-b910f82d487cf989800adbd1a65b3a7f71b46277.tar.gz | |
Import Apache apr-util-1.5.2 into vendor staging area.
Diffstat (limited to 'dbd/apr_dbd_pgsql.c')
| -rw-r--r-- | dbd/apr_dbd_pgsql.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dbd/apr_dbd_pgsql.c b/dbd/apr_dbd_pgsql.c index 21f2179..52c83ec 100644 --- a/dbd/apr_dbd_pgsql.c +++ b/dbd/apr_dbd_pgsql.c @@ -265,7 +265,7 @@ static int dbd_pgsql_get_row(apr_pool_t *pool, apr_dbd_results_t *res, if (res->random) { if ((row->n >= 0) && (size_t)row->n >= res->ntuples) { *rowp = NULL; - apr_pool_cleanup_run(pool, res->res, clear_result); + apr_pool_cleanup_run(res->pool, res->res, clear_result); res->res = NULL; return -1; } @@ -470,7 +470,7 @@ static const char *dbd_pgsql_escape(apr_pool_t *pool, const char *arg, { size_t len = strlen(arg); char *ret = apr_palloc(pool, 2*len + 2); - PQescapeString(ret, arg, len); + PQescapeStringConn(sql->conn, ret, arg, len, NULL); return ret; } |
