You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2018/09/19 18:49:38 UTC
svn commit: r1841363 - in /commons/proper/daemon/trunk/src:
changes/changes.xml native/windows/src/registry.c
Author: ggregory
Date: Wed Sep 19 18:49:37 2018
New Revision: 1841363
URL: http://svn.apache.org/viewvc?rev=1841363&view=rev
Log:
[DAEMON-392] Undefined behaviour in registry.c dwRegKey = dwRegKey++
Modified:
commons/proper/daemon/trunk/src/changes/changes.xml
commons/proper/daemon/trunk/src/native/windows/src/registry.c
Modified: commons/proper/daemon/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/changes/changes.xml?rev=1841363&r1=1841362&r2=1841363&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/changes/changes.xml (original)
+++ commons/proper/daemon/trunk/src/changes/changes.xml Wed Sep 19 18:49:37 2018
@@ -55,6 +55,9 @@
<action issue="DAEMON-393" type="fix" dev="ggregory" due-to="Daniel Hofmann">
Revered code comments for JRE and JDK locations in the registry.
</action>
+ <action issue="DAEMON-392" type="fix" dev="ggregory" due-to="Daniel Hofmann">
+ Undefined behaviour in registry.c dwRegKey = dwRegKey++
+ </action>
</release>
<release version="1.1.0" date="2017-11-15" description="Feature and bug fix release">
<action issue="DAEMON-368" type="add" dev="ggregory">
Modified: commons/proper/daemon/trunk/src/native/windows/src/registry.c
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/src/registry.c?rev=1841363&r1=1841362&r2=1841363&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/windows/src/registry.c (original)
+++ commons/proper/daemon/trunk/src/native/windows/src/registry.c Wed Sep 19 18:49:37 2018
@@ -779,7 +779,7 @@ LPWSTR apxGetJavaSoftHome(APXHANDLE hPoo
lstrcpyW(wsBuf, JRE_REGKEYS[dwRegKey]);
else
lstrcpyW(wsBuf, JDK_REGKEYS[dwRegKey]);
- dwRegKey = dwRegKey++;
+ dwRegKey++;
dwLen = lstrlenW(wsBuf);
off = &wsBuf[dwLen];
dwLen = SIZ_RESMAX;