diff options
author | peter <peter@FreeBSD.org> | 2013-07-28 06:02:40 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 2013-07-28 06:02:40 +0000 |
commit | 0aadc82afbae4dbc41da86cd4f9b2ceb8ddcb17d (patch) | |
tree | 6a96e078c28ea05d418b4e2722bc03b0b930a78b /contrib/apr-util/dbd/apr_dbd_freetds.c | |
parent | 7594fa5c70305cda65deedc5cc7e08dc037727cd (diff) | |
parent | b910f82d487cf989800adbd1a65b3a7f71b46277 (diff) | |
download | FreeBSD-src-0aadc82afbae4dbc41da86cd4f9b2ceb8ddcb17d.zip FreeBSD-src-0aadc82afbae4dbc41da86cd4f9b2ceb8ddcb17d.tar.gz |
Update subversion-1.8.0 -> 1.8.1. Update supporting
components: apr-1.4.6 -> 1.4.8 and apr-util-1.4.1 -> 1.5.2.
This is a post point-zero bug-fix / fix-sharp-edges release, including
some workarounds for UTF-8 for people who haven't yet turned on WITH_ICONV.
Diffstat (limited to 'contrib/apr-util/dbd/apr_dbd_freetds.c')
-rw-r--r-- | contrib/apr-util/dbd/apr_dbd_freetds.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/apr-util/dbd/apr_dbd_freetds.c b/contrib/apr-util/dbd/apr_dbd_freetds.c index 9a0cae7..d0b4b20 100644 --- a/contrib/apr-util/dbd/apr_dbd_freetds.c +++ b/contrib/apr-util/dbd/apr_dbd_freetds.c @@ -327,7 +327,7 @@ static int dbd_freetds_get_row(apr_pool_t *pool, apr_dbd_results_t *res, case SUCCEED: return 0; case REG_ROW: return 0; case NO_MORE_ROWS: - apr_pool_cleanup_run(pool, res->proc, clear_result); + apr_pool_cleanup_run(res->pool, res->proc, clear_result); *rowp = NULL; return -1; case FAIL: return 1; @@ -627,7 +627,7 @@ static apr_dbd_t *dbd_freetds_open(apr_pool_t *pool, const char *params, if (process == NULL) { return NULL; } - sql = apr_palloc (pool, sizeof (apr_dbd_t)); + sql = apr_pcalloc(pool, sizeof (apr_dbd_t)); sql->pool = pool; sql->proc = process; sql->params = params; |