diff options
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | misc/win32/apr_app.c | 32 |
2 files changed, 30 insertions, 5 deletions
@@ -261,6 +261,9 @@ Changes for APR 2.0.0 *) apr_proc_create(): Properly escape arguments containing whitespace characters on Windows [Ivan Zhakov] + *) Fix attempt to free invalid memory on exit when apr_app is used + on Windows. [Ivan Zhakov] + Changes for APR and APR-util 1.7.x and later: *) http://svn.apache.org/viewvc/apr/apr/branches/1.7.x/CHANGES?view=markup diff --git a/misc/win32/apr_app.c b/misc/win32/apr_app.c index 4e08e33d7..f1b6ce57c 100644 --- a/misc/win32/apr_app.c +++ b/misc/win32/apr_app.c @@ -51,15 +51,37 @@ int wmain(int argc, const wchar_t **wargv, const wchar_t **wenv) { char **argv; char **env; - int dupenv; + int envc; + int i; (void)apr_wastrtoastr(&argv, wargv, argc); - dupenv = apr_wastrtoastr(&env, wenv, -1); + envc = 0; + while (wenv[envc]) { + envc++; + } + + /* Initial environment stored as single heap block, but uses + * separate heap entry for every environment variable + * after first change. + */ + env = apr_malloc_dbg((envc + 1) * sizeof(char *), __FILE__, __LINE__); + + for (i = 0; i < envc; i++) { + apr_size_t wcount; + apr_size_t envlen; + + wcount = wcslen(wenv[i]) + 1; + envlen = (wcount - 1) * 3 + 1; + + env[i] = apr_malloc_dbg(envlen, __FILE__, __LINE__); + + (void)apr_conv_ucs2_to_utf8(wenv[i], &wcount, env[i], &envlen); + } + + env[i] = NULL; - _environ = apr_malloc_dbg((dupenv + 1) * sizeof (char *), - __FILE__, __LINE__ ); - memcpy(_environ, env, (dupenv + 1) * sizeof (char *)); + _environ = env; /* MSVCRT will attempt to maintain the wide environment calls * on _putenv(), which is bogus if we've passed a non-ascii |