From e444411df746341d33515f2d12caee0ffe5ad8b9 Mon Sep 17 00:00:00 2001 From: Stefan Fritsch Date: Sat, 31 Jul 2010 20:02:13 +0000 Subject: [PATCH] Replace apr_palloc+memcpy by apr_memdup Submitted by: Boya Sun PR: 39518 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@981085 13f79535-47bb-0310-9956-ffa450edef68 --- modules/http/mod_mime.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/http/mod_mime.c b/modules/http/mod_mime.c index fac4665aed..0ecd25f284 100644 --- a/modules/http/mod_mime.c +++ b/modules/http/mod_mime.c @@ -182,10 +182,10 @@ static void remove_items(apr_pool_t *p, apr_array_header_t *remove, APR_HASH_KEY_STRING); if (exinfo && *(const char**)((char *)exinfo + suffix[i].offset)) { extension_info *copyinfo = exinfo; - exinfo = (extension_info*)apr_palloc(p, sizeof(*exinfo)); + exinfo = apr_pmemdup(p, copyinfo, sizeof(*exinfo)); apr_hash_set(mappings, suffix[i].name, APR_HASH_KEY_STRING, exinfo); - memcpy(exinfo, copyinfo, sizeof(*exinfo)); + *(const char**)((char *)exinfo + suffix[i].offset) = NULL; } }