diff options
| author | peter <peter@FreeBSD.org> | 2014-08-12 01:40:11 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2014-08-12 01:40:11 +0000 |
| commit | 72d63a715ab3bb85109696154deb9b90d0495852 (patch) | |
| tree | ce225c894795f3e26aadf9170baf8fd0556c18d2 /contrib/apr/file_io/unix/filedup.c | |
| parent | d307c6d3b7fc94a241aab28f56b9e92a10d98bee (diff) | |
| download | FreeBSD-src-72d63a715ab3bb85109696154deb9b90d0495852.zip FreeBSD-src-72d63a715ab3bb85109696154deb9b90d0495852.tar.gz | |
MFC r266728,266731,266735,266736,268135,268960,269833
Update apr 1.4.8 -> 1.5.1
Update apr-util 1.5.2 -> 1.5.3
Update serf 1.3.4 -> 1.3.7
Update svnlite 1.8.8 -> 1.8.10
Deal with svnlite.1 manpage.
Diffstat (limited to 'contrib/apr/file_io/unix/filedup.c')
| -rw-r--r-- | contrib/apr/file_io/unix/filedup.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/contrib/apr/file_io/unix/filedup.c b/contrib/apr/file_io/unix/filedup.c index eb4fbdc..41cfec5 100644 --- a/contrib/apr/file_io/unix/filedup.c +++ b/contrib/apr/file_io/unix/filedup.c @@ -141,8 +141,7 @@ APR_DECLARE(apr_status_t) apr_file_setaside(apr_file_t **new_file, apr_file_t *old_file, apr_pool_t *p) { - *new_file = (apr_file_t *)apr_palloc(p, sizeof(apr_file_t)); - memcpy(*new_file, old_file, sizeof(apr_file_t)); + *new_file = (apr_file_t *)apr_pmemdup(p, old_file, sizeof(apr_file_t)); (*new_file)->pool = p; if (old_file->buffered) { (*new_file)->buffer = apr_palloc(p, old_file->bufsize); |
