This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-daemon.git
The following commit(s) were added to refs/heads/master by this push:
new cdaad76 Fix https://issues.apache.org/jira/browse/DAEMON-408 Procrun
start fail
cdaad76 is described below
commit cdaad76b0689df633690601bd1a4db193588371d
Author: Mark Thomas <[email protected]>
AuthorDate: Wed Sep 25 12:34:12 2019 +0100
Fix https://issues.apache.org/jira/browse/DAEMON-408 Procrun start fail
Correct a regression in the fix for DAEMON-401 that prevented the
service from starting unless support for the universal C runtime had
been installed.
---
src/changes/changes.xml | 5 +++++
src/native/windows/apps/prunsrv/prunsrv.c | 2 +-
src/native/windows/src/utils.c | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index c6fc64a..d93c816 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -39,6 +39,11 @@
</properties>
<body>
<release version="1.2.2" date="TBD" description="Bug fix release">
+ <action issue="DAEMON-408" type="fix" dev="markt">
+ Procrun. Correct a regression in the fix for DAEMON-401 that prevented
+ the service from starting unless support for the universal C runtime
had
+ been installed.
+ </action>
</release>
<release version="1.2.1" date="2019-09-09" description="Bug fix release">
<action issue="DAEMON-403" type="fix" dev="markt" due-to="Charles">
diff --git a/src/native/windows/apps/prunsrv/prunsrv.c
b/src/native/windows/apps/prunsrv/prunsrv.c
index 431ddbf..fc06db8 100644
--- a/src/native/windows/apps/prunsrv/prunsrv.c
+++ b/src/native/windows/apps/prunsrv/prunsrv.c
@@ -417,7 +417,7 @@ void apxSetInprocEnvironment()
{
LPWSTR p, e;
HMODULE hmodUcrt;
- WPUTENV wputenv_ucrt;
+ WPUTENV wputenv_ucrt = NULL;
if (!SO_ENVIRONMENT)
return; /* Nothing to do */
diff --git a/src/native/windows/src/utils.c b/src/native/windows/src/utils.c
index c42de27..21a26f1 100644
--- a/src/native/windows/src/utils.c
+++ b/src/native/windows/src/utils.c
@@ -61,7 +61,7 @@ BOOL apxAddToPathW(APXHANDLE hPool, LPCWSTR szAdd)
DWORD rc;
DWORD al;
HMODULE hmodUcrt;
- WPUTENV wputenv_ucrt;
+ WPUTENV wputenv_ucrt = NULL;
rc = GetEnvironmentVariableW(L"PATH", NULL, 0);
if (rc == 0 && GetLastError() == ERROR_ENVVAR_NOT_FOUND)
