diff options
| author | peter <peter@FreeBSD.org> | 2014-05-27 07:15:14 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2014-05-27 07:15:14 +0000 |
| commit | 073d039ce1755179ade6d76571f16045ade34213 (patch) | |
| tree | 0e023fb89b7a7e9a4fa11cfb7d9118a7510d2640 /contrib/apr/file_io/unix/filedup.c | |
| parent | c5be37fb1f34d0c40f8f70140824b785f414c4da (diff) | |
| parent | ca02a2bfd2f08739388e00fb3bbe93fa3fa5efb0 (diff) | |
| download | FreeBSD-src-073d039ce1755179ade6d76571f16045ade34213.zip FreeBSD-src-073d039ce1755179ade6d76571f16045ade34213.tar.gz | |
Merge apr-1.4.8 -> apr-1.5.1 and update.
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); |
